From 244e6ca8c227ddbf5ebcbd39414b15bd1ffc161f Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Thu, 16 Jul 2020 08:21:08 +0000
Subject: [PATCH] Update web-platform-tests to revision
 765a5cba3fd8477f430cbd8bc3489b474097ee0e

---
 .../CSS2/floats/hit-test-floats-004.html.ini  |   4 -
 .../CSS2/floats/hit-test-floats-005.html.ini  |   4 -
 .../border-radius-clipping-002.html.ini       |   2 +
 .../css/cssom-view/CaretPosition-001.html.ini |   4 -
 .../cssom-view/elementFromPoint-001.html.ini  |   4 +
 .../matchMedia-display-none-iframe.html.ini   |   2 +
 .../fetch/content-type/response.window.js.ini |  21 +-
 .../fetch/content-type/script.window.js.ini   |   3 +
 .../nosniff/parsing-nosniff.window.js.ini     |   2 +-
 .../traverse_the_history_5.html.ini           |   4 +
 ...ross-origin-objects-on-new-window.html.ini |   2 +
 .../hash-name-reference.html.ini              |   3 +
 .../embed-network-error.sub.html.ini          |  14 +
 .../iframe-loading-lazy-base-url-2.html.ini}  |   2 +-
 .../iframe-loading-lazy-base-url.html.ini}    |   2 +-
 .../iframe-loading-lazy-load-event.html.ini}  |   2 +-
 ...rame-loading-lazy-multiple-times.html.ini} |   2 +-
 .../iframe-loading-lazy-to-eager.html.ini}    |   2 +-
 .../iframe-loading-lazy.html.ini              |   7 +
 .../iframe-network-error.sub.html.ini         |   7 +
 .../iframe_sandbox_popups_escaping-1.html.ini |   2 +-
 .../iframe_sandbox_popups_escaping-2.html.ini |   2 +-
 ...rame_sandbox_popups_nonescaping-1.html.ini |   2 +-
 ...rame_sandbox_popups_nonescaping-2.html.ini |   3 +-
 .../execution-timing/077.html.ini             |   4 -
 .../module-static-import-delayed.html.ini     |   4 +
 ...le-event-handler-settings-objects.html.ini |   2 +-
 ...ob-entry-different-function-realm.html.ini |   5 +-
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../same-origin/a-tag.http.html.ini           |   3 +-
 .../same-origin/fetch.http.html.ini           |   7 -
 .../same-origin/iframe-tag.http.html.ini      |   8 -
 .../same-origin/img-tag.http.html.ini         |   7 -
 .../same-origin/script-tag.http.html.ini      |   7 -
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../top.http-rp/same-origin/xhr.http.html.ini |   7 -
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../unsafe-url/a-tag.http.html.ini            |   9 +-
 .../unsafe-url/fetch.http.html.ini            |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../unsafe-url/img-tag.http.html.ini          |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../top.http-rp/unsafe-url/xhr.http.html.ini  |  37 ---
 .../gen/top.http-rp/unset/a-tag.http.html.ini |   9 +-
 .../gen/top.http-rp/unset/fetch.http.html.ini |  37 ---
 .../unset/iframe-tag.http.html.ini            |  38 ---
 .../top.http-rp/unset/img-tag.http.html.ini   |  37 ---
 .../unset/script-tag.http.html.ini            |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../gen/top.http-rp/unset/xhr.http.html.ini   |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../top.meta/same-origin/a-tag.http.html.ini  |   3 +-
 .../top.meta/same-origin/fetch.http.html.ini  |   7 -
 .../same-origin/iframe-tag.http.html.ini      |   8 -
 .../same-origin/img-tag.http.html.ini         |   7 -
 .../same-origin/script-tag.http.html.ini      |   7 -
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../top.meta/same-origin/xhr.http.html.ini    |   7 -
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../top.meta/unsafe-url/a-tag.http.html.ini   |   9 +-
 .../top.meta/unsafe-url/fetch.http.html.ini   |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../top.meta/unsafe-url/img-tag.http.html.ini |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../gen/top.meta/unsafe-url/xhr.http.html.ini |  37 ---
 .../gen/top.meta/unset/a-tag.http.html.ini    |   9 +-
 .../gen/top.meta/unset/fetch.http.html.ini    |  37 ---
 .../top.meta/unset/iframe-tag.http.html.ini   |  38 ---
 .../gen/top.meta/unset/img-tag.http.html.ini  |  37 ---
 .../top.meta/unset/script-tag.http.html.ini   |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../4K+1/gen/top.meta/unset/xhr.http.html.ini |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../same-origin/a-tag.http.html.ini           |   3 +-
 .../same-origin/fetch.http.html.ini           |   7 -
 .../same-origin/iframe-tag.http.html.ini      |   8 -
 .../same-origin/img-tag.http.html.ini         |   7 -
 .../same-origin/script-tag.http.html.ini      |   7 -
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../top.http-rp/same-origin/xhr.http.html.ini |   7 -
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../unsafe-url/a-tag.http.html.ini            |   9 +-
 .../unsafe-url/fetch.http.html.ini            |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../unsafe-url/img-tag.http.html.ini          |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../top.http-rp/unsafe-url/xhr.http.html.ini  |  37 ---
 .../gen/top.http-rp/unset/a-tag.http.html.ini |   9 +-
 .../gen/top.http-rp/unset/fetch.http.html.ini |  37 ---
 .../unset/iframe-tag.http.html.ini            |  38 ---
 .../top.http-rp/unset/img-tag.http.html.ini   |  37 ---
 .../unset/script-tag.http.html.ini            |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../gen/top.http-rp/unset/xhr.http.html.ini   |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../top.meta/same-origin/a-tag.http.html.ini  |   3 +-
 .../top.meta/same-origin/fetch.http.html.ini  |   7 -
 .../same-origin/iframe-tag.http.html.ini      |   8 -
 .../same-origin/img-tag.http.html.ini         |   7 -
 .../same-origin/script-tag.http.html.ini      |   7 -
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../top.meta/same-origin/xhr.http.html.ini    |   7 -
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../top.meta/unsafe-url/a-tag.http.html.ini   |   9 +-
 .../top.meta/unsafe-url/fetch.http.html.ini   |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../top.meta/unsafe-url/img-tag.http.html.ini |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../gen/top.meta/unsafe-url/xhr.http.html.ini |  37 ---
 .../gen/top.meta/unset/a-tag.http.html.ini    |   9 +-
 .../gen/top.meta/unset/fetch.http.html.ini    |  37 ---
 .../top.meta/unset/iframe-tag.http.html.ini   |  38 ---
 .../gen/top.meta/unset/img-tag.http.html.ini  |  37 ---
 .../top.meta/unset/script-tag.http.html.ini   |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../4K-1/gen/top.meta/unset/xhr.http.html.ini |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../same-origin/a-tag.http.html.ini           |   3 +-
 .../same-origin/fetch.http.html.ini           |   7 -
 .../same-origin/iframe-tag.http.html.ini      |   8 -
 .../same-origin/img-tag.http.html.ini         |   7 -
 .../same-origin/script-tag.http.html.ini      |   7 -
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../top.http-rp/same-origin/xhr.http.html.ini |   7 -
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../unsafe-url/a-tag.http.html.ini            |   9 +-
 .../unsafe-url/fetch.http.html.ini            |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../unsafe-url/img-tag.http.html.ini          |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../top.http-rp/unsafe-url/xhr.http.html.ini  |  37 ---
 .../gen/top.http-rp/unset/a-tag.http.html.ini |   9 +-
 .../gen/top.http-rp/unset/fetch.http.html.ini |  37 ---
 .../unset/iframe-tag.http.html.ini            |  38 ---
 .../top.http-rp/unset/img-tag.http.html.ini   |  37 ---
 .../unset/script-tag.http.html.ini            |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../gen/top.http-rp/unset/xhr.http.html.ini   |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../top.meta/same-origin/a-tag.http.html.ini  |   3 +-
 .../top.meta/same-origin/fetch.http.html.ini  |   7 -
 .../same-origin/iframe-tag.http.html.ini      |   8 -
 .../same-origin/img-tag.http.html.ini         |   7 -
 .../same-origin/script-tag.http.html.ini      |   7 -
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../top.meta/same-origin/xhr.http.html.ini    |   7 -
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../top.meta/unsafe-url/a-tag.http.html.ini   |   9 +-
 .../top.meta/unsafe-url/fetch.http.html.ini   |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../top.meta/unsafe-url/img-tag.http.html.ini |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../gen/top.meta/unsafe-url/xhr.http.html.ini |  37 ---
 .../4K/gen/top.meta/unset/a-tag.http.html.ini |   9 +-
 .../4K/gen/top.meta/unset/fetch.http.html.ini |  37 ---
 .../top.meta/unset/iframe-tag.http.html.ini   |  38 ---
 .../gen/top.meta/unset/img-tag.http.html.ini  |  37 ---
 .../top.meta/unset/script-tag.http.html.ini   |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../4K/gen/top.meta/unset/xhr.http.html.ini   |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../no-referrer/a-tag.http.html.ini           |  14 -
 .../no-referrer/iframe-tag.http.html.ini      |  38 ---
 .../no-referrer/img-tag.http.html.ini         |  37 ---
 .../no-referrer/script-tag.http.html.ini      |  37 ---
 .../no-referrer/xhr.http.html.ini             |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |   6 -
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../iframe.http-rp/origin/a-tag.http.html.ini |   9 +-
 .../origin/iframe-tag.http.html.ini           |  38 ---
 .../origin/img-tag.http.html.ini              |  37 ---
 .../origin/script-tag.http.html.ini           |  37 ---
 .../iframe.http-rp/origin/xhr.http.html.ini   |  37 ---
 .../same-origin/a-tag.http.html.ini           |   9 +-
 .../same-origin/fetch.http.html.ini           |   6 -
 .../same-origin/iframe-tag.http.html.ini      |  32 ---
 .../same-origin/img-tag.http.html.ini         |  31 --
 .../same-origin/script-tag.http.html.ini      |  31 --
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../same-origin/xhr.http.html.ini             |  31 --
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |   6 -
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../strict-origin/a-tag.http.html.ini         |   9 +-
 .../strict-origin/iframe-tag.http.html.ini    |  38 ---
 .../strict-origin/img-tag.http.html.ini       |  37 ---
 .../strict-origin/script-tag.http.html.ini    |  37 ---
 .../strict-origin/xhr.http.html.ini           |  37 ---
 .../unsafe-url/a-tag.http.html.ini            |   9 +-
 .../unsafe-url/fetch.http.html.ini            |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../unsafe-url/img-tag.http.html.ini          |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../unsafe-url/xhr.http.html.ini              |  37 ---
 .../iframe.http-rp/unset/a-tag.http.html.ini  |   9 +-
 .../iframe.http-rp/unset/fetch.http.html.ini  |  37 ---
 .../unset/iframe-tag.http.html.ini            |  38 ---
 .../unset/img-tag.http.html.ini               |  37 ---
 .../unset/script-tag.http.html.ini            |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../iframe.http-rp/unset/xhr.http.html.ini    |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../no-referrer/a-tag.http.html.ini           |  14 -
 .../no-referrer/iframe-tag.http.html.ini      |  38 ---
 .../no-referrer/img-tag.http.html.ini         |  37 ---
 .../no-referrer/script-tag.http.html.ini      |  37 ---
 .../iframe.meta/no-referrer/xhr.http.html.ini |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |   6 -
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../iframe.meta/origin/a-tag.http.html.ini    |   9 +-
 .../origin/iframe-tag.http.html.ini           |  38 ---
 .../iframe.meta/origin/img-tag.http.html.ini  |  37 ---
 .../origin/script-tag.http.html.ini           |  37 ---
 .../gen/iframe.meta/origin/xhr.http.html.ini  |  37 ---
 .../same-origin/a-tag.http.html.ini           |   9 +-
 .../same-origin/fetch.http.html.ini           |   6 -
 .../same-origin/iframe-tag.http.html.ini      |  32 ---
 .../same-origin/img-tag.http.html.ini         |  31 --
 .../same-origin/script-tag.http.html.ini      |  31 --
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../iframe.meta/same-origin/xhr.http.html.ini |  31 --
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |   6 -
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../strict-origin/a-tag.http.html.ini         |   9 +-
 .../strict-origin/iframe-tag.http.html.ini    |  38 ---
 .../strict-origin/img-tag.http.html.ini       |  37 ---
 .../strict-origin/script-tag.http.html.ini    |  37 ---
 .../strict-origin/xhr.http.html.ini           |  37 ---
 .../unsafe-url/a-tag.http.html.ini            |   9 +-
 .../unsafe-url/fetch.http.html.ini            |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../unsafe-url/img-tag.http.html.ini          |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../iframe.meta/unsafe-url/xhr.http.html.ini  |  37 ---
 .../gen/iframe.meta/unset/a-tag.http.html.ini |   9 +-
 .../gen/iframe.meta/unset/fetch.http.html.ini |  37 ---
 .../unset/iframe-tag.http.html.ini            |  38 ---
 .../iframe.meta/unset/img-tag.http.html.ini   |  37 ---
 .../unset/script-tag.http.html.ini            |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../gen/iframe.meta/unset/xhr.http.html.ini   |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../iframe-tag.http.html.ini                  |  25 +-
 .../img-tag.http.html.ini                     |  37 ---
 .../req.attr/no-referrer/a-tag.http.html.ini  |  14 -
 .../no-referrer/iframe-tag.http.html.ini      |  25 +-
 .../no-referrer/img-tag.http.html.ini         |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../iframe-tag.http.html.ini                  |  25 +-
 .../img-tag.http.html.ini                     |  37 ---
 .../gen/req.attr/origin/a-tag.http.html.ini   |   9 +-
 .../req.attr/origin/iframe-tag.http.html.ini  |  25 +-
 .../gen/req.attr/origin/img-tag.http.html.ini |  37 ---
 .../req.attr/same-origin/a-tag.http.html.ini  |   9 +-
 .../same-origin/iframe-tag.http.html.ini      |  29 +-
 .../same-origin/img-tag.http.html.ini         |  31 --
 .../same-origin/script-tag.http.html.ini      |  24 --
 .../a-tag.http.html.ini                       |   9 +-
 .../iframe-tag.http.html.ini                  |  25 +-
 .../img-tag.http.html.ini                     |  37 ---
 .../strict-origin/a-tag.http.html.ini         |   9 +-
 .../strict-origin/iframe-tag.http.html.ini    |  25 +-
 .../strict-origin/img-tag.http.html.ini       |  37 ---
 .../req.attr/unsafe-url/a-tag.http.html.ini   |   9 +-
 .../unsafe-url/iframe-tag.http.html.ini       |  25 +-
 .../req.attr/unsafe-url/img-tag.http.html.ini |  37 ---
 .../no-referrer/a-tag.http.html.ini           |  14 -
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../no-referrer/a-tag.http.html.ini           |  14 -
 .../no-referrer/iframe-tag.http.html.ini      |  38 ---
 .../no-referrer/img-tag.http.html.ini         |  37 ---
 .../no-referrer/script-tag.http.html.ini      |  37 ---
 .../top.http-rp/no-referrer/xhr.http.html.ini |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |   6 -
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../top.http-rp/origin/a-tag.http.html.ini    |   9 +-
 .../origin/iframe-tag.http.html.ini           |  38 ---
 .../top.http-rp/origin/img-tag.http.html.ini  |  37 ---
 .../origin/script-tag.http.html.ini           |  37 ---
 .../gen/top.http-rp/origin/xhr.http.html.ini  |  37 ---
 .../same-origin/a-tag.http.html.ini           |   9 +-
 .../same-origin/fetch.http.html.ini           |   6 -
 .../same-origin/iframe-tag.http.html.ini      |  32 ---
 .../same-origin/img-tag.http.html.ini         |  31 --
 .../same-origin/script-tag.http.html.ini      |  31 --
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../top.http-rp/same-origin/xhr.http.html.ini |  31 --
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |   6 -
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../strict-origin/a-tag.http.html.ini         |   9 +-
 .../strict-origin/iframe-tag.http.html.ini    |  38 ---
 .../strict-origin/img-tag.http.html.ini       |  37 ---
 .../strict-origin/script-tag.http.html.ini    |  37 ---
 .../strict-origin/xhr.http.html.ini           |  37 ---
 .../unsafe-url/a-tag.http.html.ini            |   9 +-
 .../unsafe-url/fetch.http.html.ini            |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../unsafe-url/img-tag.http.html.ini          |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../top.http-rp/unsafe-url/xhr.http.html.ini  |  37 ---
 .../gen/top.http-rp/unset/a-tag.http.html.ini |   9 +-
 .../gen/top.http-rp/unset/fetch.http.html.ini |  37 ---
 .../unset/iframe-tag.http.html.ini            |  38 ---
 .../top.http-rp/unset/img-tag.http.html.ini   |  37 ---
 .../unset/script-tag.http.html.ini            |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../gen/top.http-rp/unset/xhr.http.html.ini   |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../top.meta/no-referrer/a-tag.http.html.ini  |  14 -
 .../no-referrer/iframe-tag.http.html.ini      |  38 ---
 .../no-referrer/img-tag.http.html.ini         |  37 ---
 .../no-referrer/script-tag.http.html.ini      |  37 ---
 .../top.meta/no-referrer/xhr.http.html.ini    |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |   6 -
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../gen/top.meta/origin/a-tag.http.html.ini   |   9 +-
 .../top.meta/origin/iframe-tag.http.html.ini  |  38 ---
 .../gen/top.meta/origin/img-tag.http.html.ini |  37 ---
 .../top.meta/origin/script-tag.http.html.ini  |  37 ---
 .../gen/top.meta/origin/xhr.http.html.ini     |  37 ---
 .../top.meta/same-origin/a-tag.http.html.ini  |   9 +-
 .../top.meta/same-origin/fetch.http.html.ini  |   6 -
 .../same-origin/iframe-tag.http.html.ini      |  32 ---
 .../same-origin/img-tag.http.html.ini         |  31 --
 .../same-origin/script-tag.http.html.ini      |  31 --
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../top.meta/same-origin/xhr.http.html.ini    |  31 --
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |   6 -
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../strict-origin/a-tag.http.html.ini         |   9 +-
 .../strict-origin/iframe-tag.http.html.ini    |  38 ---
 .../strict-origin/img-tag.http.html.ini       |  37 ---
 .../strict-origin/script-tag.http.html.ini    |  37 ---
 .../top.meta/strict-origin/xhr.http.html.ini  |  37 ---
 .../top.meta/unsafe-url/a-tag.http.html.ini   |   9 +-
 .../top.meta/unsafe-url/fetch.http.html.ini   |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../top.meta/unsafe-url/img-tag.http.html.ini |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../gen/top.meta/unsafe-url/xhr.http.html.ini |  37 ---
 .../gen/top.meta/unset/a-tag.http.html.ini    |   9 +-
 .../gen/top.meta/unset/fetch.http.html.ini    |  37 ---
 .../top.meta/unset/iframe-tag.http.html.ini   |  38 ---
 .../gen/top.meta/unset/img-tag.http.html.ini  |  37 ---
 .../top.meta/unset/script-tag.http.html.ini   |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../gen/top.meta/unset/xhr.http.html.ini      |  37 ---
 .../fetch.http.html.ini                       |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../fetch.http.html.ini                       |   6 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   6 -
 .../same-origin/fetch.http.html.ini           |   6 -
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../same-origin/xhr.http.html.ini             |   6 -
 .../fetch.http.html.ini                       |   6 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   6 -
 .../unsafe-url/fetch.http.html.ini            |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../unsafe-url/xhr.http.html.ini              |  37 ---
 .../unset/fetch.http.html.ini                 |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../unset/xhr.http.html.ini                   |  37 ---
 .../tests/switch_to_frame/switch.py.ini       |   7 +
 .../switch_to_frame/switch_number.py.ini      |  16 ++
 .../switch_to_frame/switch_webelement.py.ini  |   7 +
 .../webmessaging/with-ports/017.html.ini      |   5 +
 .../webmessaging/with-ports/018.html.ini      |   5 -
 .../webmessaging/without-ports/018.html.ini   |   5 -
 .../Worker/Worker-constructor.html.ini        |   2 +
 tests/wpt/metadata/MANIFEST.json              | 271 ++++++++++++++----
 .../CSS2/floats/hit-test-floats-004.html.ini  |   4 -
 .../CSS2/floats/hit-test-floats-005.html.ini  |   4 -
 .../border-radius-clipping-002.html.ini       |   2 +
 .../css/cssom-view/CaretPosition-001.html.ini |   4 -
 .../cssom-view/elementFromPoint-001.html.ini  |   4 +
 .../matchMedia-display-none-iframe.html.ini   |   2 +
 .../fetch/content-type/response.window.js.ini |  21 +-
 .../fetch/content-type/script.window.js.ini   |   3 +
 .../nosniff/parsing-nosniff.window.js.ini     |   2 +-
 .../traverse_the_history_5.html.ini           |   4 +
 ...ross-origin-objects-on-new-window.html.ini |   2 +
 .../hash-name-reference.html.ini              |   3 +
 .../embed-network-error.sub.html.ini          |  14 +
 .../iframe-loading-lazy-base-url-2.html.ini   |   4 +
 .../iframe-loading-lazy-base-url.html.ini     |   4 +
 .../iframe-loading-lazy-load-event.html.ini   |   7 +
 ...frame-loading-lazy-multiple-times.html.ini |   4 +
 .../iframe-loading-lazy-to-eager.html.ini     |   4 +
 .../iframe-loading-lazy.html.ini              |   7 +
 .../iframe-loading-lazy.tentative.html.ini    |  10 -
 .../iframe-network-error.sub.html.ini         |   7 +
 .../iframe_sandbox_popups_escaping-1.html.ini |   2 +-
 .../iframe_sandbox_popups_escaping-2.html.ini |   2 +-
 ...rame_sandbox_popups_nonescaping-1.html.ini |   2 +-
 ...rame_sandbox_popups_nonescaping-2.html.ini |   3 +-
 .../execution-timing/077.html.ini             |   4 -
 .../module-static-import-delayed.html.ini     |   4 +
 ...le-event-handler-settings-objects.html.ini |   2 +-
 ...ob-entry-different-function-realm.html.ini |   5 +-
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../same-origin/a-tag.http.html.ini           |   3 +-
 .../same-origin/fetch.http.html.ini           |   7 -
 .../same-origin/iframe-tag.http.html.ini      |   8 -
 .../same-origin/img-tag.http.html.ini         |   7 -
 .../same-origin/script-tag.http.html.ini      |   7 -
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../top.http-rp/same-origin/xhr.http.html.ini |   7 -
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../unsafe-url/a-tag.http.html.ini            |   9 +-
 .../unsafe-url/fetch.http.html.ini            |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../unsafe-url/img-tag.http.html.ini          |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../top.http-rp/unsafe-url/xhr.http.html.ini  |  37 ---
 .../gen/top.http-rp/unset/a-tag.http.html.ini |   9 +-
 .../gen/top.http-rp/unset/fetch.http.html.ini |  37 ---
 .../unset/iframe-tag.http.html.ini            |  38 ---
 .../top.http-rp/unset/img-tag.http.html.ini   |  37 ---
 .../unset/script-tag.http.html.ini            |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../gen/top.http-rp/unset/xhr.http.html.ini   |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../top.meta/same-origin/a-tag.http.html.ini  |   3 +-
 .../top.meta/same-origin/fetch.http.html.ini  |   7 -
 .../same-origin/iframe-tag.http.html.ini      |   8 -
 .../same-origin/img-tag.http.html.ini         |   7 -
 .../same-origin/script-tag.http.html.ini      |   7 -
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../top.meta/same-origin/xhr.http.html.ini    |   7 -
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../top.meta/unsafe-url/a-tag.http.html.ini   |   9 +-
 .../top.meta/unsafe-url/fetch.http.html.ini   |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../top.meta/unsafe-url/img-tag.http.html.ini |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../gen/top.meta/unsafe-url/xhr.http.html.ini |  37 ---
 .../gen/top.meta/unset/a-tag.http.html.ini    |   9 +-
 .../gen/top.meta/unset/fetch.http.html.ini    |  37 ---
 .../top.meta/unset/iframe-tag.http.html.ini   |  38 ---
 .../gen/top.meta/unset/img-tag.http.html.ini  |  37 ---
 .../top.meta/unset/script-tag.http.html.ini   |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../4K+1/gen/top.meta/unset/xhr.http.html.ini |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../same-origin/a-tag.http.html.ini           |   3 +-
 .../same-origin/fetch.http.html.ini           |   7 -
 .../same-origin/iframe-tag.http.html.ini      |   8 -
 .../same-origin/img-tag.http.html.ini         |   7 -
 .../same-origin/script-tag.http.html.ini      |   7 -
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../top.http-rp/same-origin/xhr.http.html.ini |   7 -
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../unsafe-url/a-tag.http.html.ini            |   9 +-
 .../unsafe-url/fetch.http.html.ini            |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../unsafe-url/img-tag.http.html.ini          |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../top.http-rp/unsafe-url/xhr.http.html.ini  |  37 ---
 .../gen/top.http-rp/unset/a-tag.http.html.ini |   9 +-
 .../gen/top.http-rp/unset/fetch.http.html.ini |  37 ---
 .../unset/iframe-tag.http.html.ini            |  38 ---
 .../top.http-rp/unset/img-tag.http.html.ini   |  37 ---
 .../unset/script-tag.http.html.ini            |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../gen/top.http-rp/unset/xhr.http.html.ini   |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../top.meta/same-origin/a-tag.http.html.ini  |   3 +-
 .../top.meta/same-origin/fetch.http.html.ini  |   7 -
 .../same-origin/iframe-tag.http.html.ini      |   8 -
 .../same-origin/img-tag.http.html.ini         |   7 -
 .../same-origin/script-tag.http.html.ini      |   7 -
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../top.meta/same-origin/xhr.http.html.ini    |   7 -
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../top.meta/unsafe-url/a-tag.http.html.ini   |   9 +-
 .../top.meta/unsafe-url/fetch.http.html.ini   |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../top.meta/unsafe-url/img-tag.http.html.ini |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../gen/top.meta/unsafe-url/xhr.http.html.ini |  37 ---
 .../gen/top.meta/unset/a-tag.http.html.ini    |   9 +-
 .../gen/top.meta/unset/fetch.http.html.ini    |  37 ---
 .../top.meta/unset/iframe-tag.http.html.ini   |  38 ---
 .../gen/top.meta/unset/img-tag.http.html.ini  |  37 ---
 .../top.meta/unset/script-tag.http.html.ini   |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../4K-1/gen/top.meta/unset/xhr.http.html.ini |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../same-origin/a-tag.http.html.ini           |   3 +-
 .../same-origin/fetch.http.html.ini           |   7 -
 .../same-origin/iframe-tag.http.html.ini      |   8 -
 .../same-origin/img-tag.http.html.ini         |   7 -
 .../same-origin/script-tag.http.html.ini      |   7 -
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../top.http-rp/same-origin/xhr.http.html.ini |   7 -
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../unsafe-url/a-tag.http.html.ini            |   9 +-
 .../unsafe-url/fetch.http.html.ini            |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../unsafe-url/img-tag.http.html.ini          |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../top.http-rp/unsafe-url/xhr.http.html.ini  |  37 ---
 .../gen/top.http-rp/unset/a-tag.http.html.ini |   9 +-
 .../gen/top.http-rp/unset/fetch.http.html.ini |  37 ---
 .../unset/iframe-tag.http.html.ini            |  38 ---
 .../top.http-rp/unset/img-tag.http.html.ini   |  37 ---
 .../unset/script-tag.http.html.ini            |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../gen/top.http-rp/unset/xhr.http.html.ini   |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../top.meta/same-origin/a-tag.http.html.ini  |   3 +-
 .../top.meta/same-origin/fetch.http.html.ini  |   7 -
 .../same-origin/iframe-tag.http.html.ini      |   8 -
 .../same-origin/img-tag.http.html.ini         |   7 -
 .../same-origin/script-tag.http.html.ini      |   7 -
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../top.meta/same-origin/xhr.http.html.ini    |   7 -
 .../a-tag.http.html.ini                       |   3 +-
 .../fetch.http.html.ini                       |   7 -
 .../iframe-tag.http.html.ini                  |   8 -
 .../img-tag.http.html.ini                     |   7 -
 .../script-tag.http.html.ini                  |   7 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   7 -
 .../top.meta/unsafe-url/a-tag.http.html.ini   |   9 +-
 .../top.meta/unsafe-url/fetch.http.html.ini   |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../top.meta/unsafe-url/img-tag.http.html.ini |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../gen/top.meta/unsafe-url/xhr.http.html.ini |  37 ---
 .../4K/gen/top.meta/unset/a-tag.http.html.ini |   9 +-
 .../4K/gen/top.meta/unset/fetch.http.html.ini |  37 ---
 .../top.meta/unset/iframe-tag.http.html.ini   |  38 ---
 .../gen/top.meta/unset/img-tag.http.html.ini  |  37 ---
 .../top.meta/unset/script-tag.http.html.ini   |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../4K/gen/top.meta/unset/xhr.http.html.ini   |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../no-referrer/a-tag.http.html.ini           |  14 -
 .../no-referrer/iframe-tag.http.html.ini      |  38 ---
 .../no-referrer/img-tag.http.html.ini         |  37 ---
 .../no-referrer/script-tag.http.html.ini      |  37 ---
 .../no-referrer/xhr.http.html.ini             |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |   6 -
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../iframe.http-rp/origin/a-tag.http.html.ini |   9 +-
 .../origin/iframe-tag.http.html.ini           |  38 ---
 .../origin/img-tag.http.html.ini              |  37 ---
 .../origin/script-tag.http.html.ini           |  37 ---
 .../iframe.http-rp/origin/xhr.http.html.ini   |  37 ---
 .../same-origin/a-tag.http.html.ini           |   9 +-
 .../same-origin/fetch.http.html.ini           |   6 -
 .../same-origin/iframe-tag.http.html.ini      |  32 ---
 .../same-origin/img-tag.http.html.ini         |  31 --
 .../same-origin/script-tag.http.html.ini      |  31 --
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../same-origin/xhr.http.html.ini             |  31 --
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |   6 -
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../strict-origin/a-tag.http.html.ini         |   9 +-
 .../strict-origin/iframe-tag.http.html.ini    |  38 ---
 .../strict-origin/img-tag.http.html.ini       |  37 ---
 .../strict-origin/script-tag.http.html.ini    |  37 ---
 .../strict-origin/xhr.http.html.ini           |  37 ---
 .../unsafe-url/a-tag.http.html.ini            |   9 +-
 .../unsafe-url/fetch.http.html.ini            |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../unsafe-url/img-tag.http.html.ini          |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../unsafe-url/xhr.http.html.ini              |  37 ---
 .../iframe.http-rp/unset/a-tag.http.html.ini  |   9 +-
 .../iframe.http-rp/unset/fetch.http.html.ini  |  37 ---
 .../unset/iframe-tag.http.html.ini            |  38 ---
 .../unset/img-tag.http.html.ini               |  37 ---
 .../unset/script-tag.http.html.ini            |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../iframe.http-rp/unset/xhr.http.html.ini    |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../no-referrer/a-tag.http.html.ini           |  14 -
 .../no-referrer/iframe-tag.http.html.ini      |  38 ---
 .../no-referrer/img-tag.http.html.ini         |  37 ---
 .../no-referrer/script-tag.http.html.ini      |  37 ---
 .../iframe.meta/no-referrer/xhr.http.html.ini |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |   6 -
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../iframe.meta/origin/a-tag.http.html.ini    |   9 +-
 .../origin/iframe-tag.http.html.ini           |  38 ---
 .../iframe.meta/origin/img-tag.http.html.ini  |  37 ---
 .../origin/script-tag.http.html.ini           |  37 ---
 .../gen/iframe.meta/origin/xhr.http.html.ini  |  37 ---
 .../same-origin/a-tag.http.html.ini           |   9 +-
 .../same-origin/fetch.http.html.ini           |   6 -
 .../same-origin/iframe-tag.http.html.ini      |  32 ---
 .../same-origin/img-tag.http.html.ini         |  31 --
 .../same-origin/script-tag.http.html.ini      |  31 --
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../iframe.meta/same-origin/xhr.http.html.ini |  31 --
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |   6 -
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../strict-origin/a-tag.http.html.ini         |   9 +-
 .../strict-origin/iframe-tag.http.html.ini    |  38 ---
 .../strict-origin/img-tag.http.html.ini       |  37 ---
 .../strict-origin/script-tag.http.html.ini    |  37 ---
 .../strict-origin/xhr.http.html.ini           |  37 ---
 .../unsafe-url/a-tag.http.html.ini            |   9 +-
 .../unsafe-url/fetch.http.html.ini            |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../unsafe-url/img-tag.http.html.ini          |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../iframe.meta/unsafe-url/xhr.http.html.ini  |  37 ---
 .../gen/iframe.meta/unset/a-tag.http.html.ini |   9 +-
 .../gen/iframe.meta/unset/fetch.http.html.ini |  37 ---
 .../unset/iframe-tag.http.html.ini            |  38 ---
 .../iframe.meta/unset/img-tag.http.html.ini   |  37 ---
 .../unset/script-tag.http.html.ini            |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../gen/iframe.meta/unset/xhr.http.html.ini   |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../iframe-tag.http.html.ini                  |  25 +-
 .../img-tag.http.html.ini                     |  37 ---
 .../req.attr/no-referrer/a-tag.http.html.ini  |  14 -
 .../no-referrer/iframe-tag.http.html.ini      |  25 +-
 .../no-referrer/img-tag.http.html.ini         |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../iframe-tag.http.html.ini                  |  25 +-
 .../img-tag.http.html.ini                     |  37 ---
 .../gen/req.attr/origin/a-tag.http.html.ini   |   9 +-
 .../req.attr/origin/iframe-tag.http.html.ini  |  25 +-
 .../gen/req.attr/origin/img-tag.http.html.ini |  37 ---
 .../req.attr/same-origin/a-tag.http.html.ini  |   9 +-
 .../same-origin/iframe-tag.http.html.ini      |  29 +-
 .../same-origin/img-tag.http.html.ini         |  31 --
 .../same-origin/script-tag.http.html.ini      |  24 --
 .../a-tag.http.html.ini                       |   9 +-
 .../iframe-tag.http.html.ini                  |  25 +-
 .../img-tag.http.html.ini                     |  37 ---
 .../strict-origin/a-tag.http.html.ini         |   9 +-
 .../strict-origin/iframe-tag.http.html.ini    |  25 +-
 .../strict-origin/img-tag.http.html.ini       |  37 ---
 .../req.attr/unsafe-url/a-tag.http.html.ini   |   9 +-
 .../unsafe-url/iframe-tag.http.html.ini       |  25 +-
 .../req.attr/unsafe-url/img-tag.http.html.ini |  37 ---
 .../no-referrer/a-tag.http.html.ini           |  14 -
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../no-referrer/a-tag.http.html.ini           |  14 -
 .../no-referrer/iframe-tag.http.html.ini      |  38 ---
 .../no-referrer/img-tag.http.html.ini         |  37 ---
 .../no-referrer/script-tag.http.html.ini      |  37 ---
 .../top.http-rp/no-referrer/xhr.http.html.ini |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |   6 -
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../top.http-rp/origin/a-tag.http.html.ini    |   9 +-
 .../origin/iframe-tag.http.html.ini           |  38 ---
 .../top.http-rp/origin/img-tag.http.html.ini  |  37 ---
 .../origin/script-tag.http.html.ini           |  37 ---
 .../gen/top.http-rp/origin/xhr.http.html.ini  |  37 ---
 .../same-origin/a-tag.http.html.ini           |   9 +-
 .../same-origin/fetch.http.html.ini           |   6 -
 .../same-origin/iframe-tag.http.html.ini      |  32 ---
 .../same-origin/img-tag.http.html.ini         |  31 --
 .../same-origin/script-tag.http.html.ini      |  31 --
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../top.http-rp/same-origin/xhr.http.html.ini |  31 --
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |   6 -
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../strict-origin/a-tag.http.html.ini         |   9 +-
 .../strict-origin/iframe-tag.http.html.ini    |  38 ---
 .../strict-origin/img-tag.http.html.ini       |  37 ---
 .../strict-origin/script-tag.http.html.ini    |  37 ---
 .../strict-origin/xhr.http.html.ini           |  37 ---
 .../unsafe-url/a-tag.http.html.ini            |   9 +-
 .../unsafe-url/fetch.http.html.ini            |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../unsafe-url/img-tag.http.html.ini          |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../top.http-rp/unsafe-url/xhr.http.html.ini  |  37 ---
 .../gen/top.http-rp/unset/a-tag.http.html.ini |   9 +-
 .../gen/top.http-rp/unset/fetch.http.html.ini |  37 ---
 .../unset/iframe-tag.http.html.ini            |  38 ---
 .../top.http-rp/unset/img-tag.http.html.ini   |  37 ---
 .../unset/script-tag.http.html.ini            |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../gen/top.http-rp/unset/xhr.http.html.ini   |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |  37 ---
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../top.meta/no-referrer/a-tag.http.html.ini  |  14 -
 .../no-referrer/iframe-tag.http.html.ini      |  38 ---
 .../no-referrer/img-tag.http.html.ini         |  37 ---
 .../no-referrer/script-tag.http.html.ini      |  37 ---
 .../top.meta/no-referrer/xhr.http.html.ini    |  37 ---
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |   6 -
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../gen/top.meta/origin/a-tag.http.html.ini   |   9 +-
 .../top.meta/origin/iframe-tag.http.html.ini  |  38 ---
 .../gen/top.meta/origin/img-tag.http.html.ini |  37 ---
 .../top.meta/origin/script-tag.http.html.ini  |  37 ---
 .../gen/top.meta/origin/xhr.http.html.ini     |  37 ---
 .../top.meta/same-origin/a-tag.http.html.ini  |   9 +-
 .../top.meta/same-origin/fetch.http.html.ini  |   6 -
 .../same-origin/iframe-tag.http.html.ini      |  32 ---
 .../same-origin/img-tag.http.html.ini         |  31 --
 .../same-origin/script-tag.http.html.ini      |  31 --
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../top.meta/same-origin/xhr.http.html.ini    |  31 --
 .../a-tag.http.html.ini                       |   9 +-
 .../fetch.http.html.ini                       |   6 -
 .../iframe-tag.http.html.ini                  |  38 ---
 .../img-tag.http.html.ini                     |  37 ---
 .../script-tag.http.html.ini                  |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../strict-origin/a-tag.http.html.ini         |   9 +-
 .../strict-origin/iframe-tag.http.html.ini    |  38 ---
 .../strict-origin/img-tag.http.html.ini       |  37 ---
 .../strict-origin/script-tag.http.html.ini    |  37 ---
 .../top.meta/strict-origin/xhr.http.html.ini  |  37 ---
 .../top.meta/unsafe-url/a-tag.http.html.ini   |   9 +-
 .../top.meta/unsafe-url/fetch.http.html.ini   |  37 ---
 .../unsafe-url/iframe-tag.http.html.ini       |  38 ---
 .../top.meta/unsafe-url/img-tag.http.html.ini |  37 ---
 .../unsafe-url/script-tag.http.html.ini       |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../gen/top.meta/unsafe-url/xhr.http.html.ini |  37 ---
 .../gen/top.meta/unset/a-tag.http.html.ini    |   9 +-
 .../gen/top.meta/unset/fetch.http.html.ini    |  37 ---
 .../top.meta/unset/iframe-tag.http.html.ini   |  38 ---
 .../gen/top.meta/unset/img-tag.http.html.ini  |  37 ---
 .../top.meta/unset/script-tag.http.html.ini   |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../gen/top.meta/unset/xhr.http.html.ini      |  37 ---
 .../fetch.http.html.ini                       |  37 ---
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |  37 ---
 .../fetch.http.html.ini                       |   6 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   6 -
 .../same-origin/fetch.http.html.ini           |   6 -
 .../same-origin/worker-classic.http.html.ini  |   7 -
 .../same-origin/worker-module.http.html.ini   |   7 -
 .../same-origin/xhr.http.html.ini             |   6 -
 .../fetch.http.html.ini                       |   6 -
 .../worker-classic.http.html.ini              |   7 -
 .../worker-module.http.html.ini               |   7 -
 .../xhr.http.html.ini                         |   6 -
 .../unsafe-url/fetch.http.html.ini            |  37 ---
 .../unsafe-url/worker-classic.http.html.ini   |   7 -
 .../unsafe-url/worker-module.http.html.ini    |   7 -
 .../unsafe-url/xhr.http.html.ini              |  37 ---
 .../unset/fetch.http.html.ini                 |  37 ---
 .../unset/worker-classic.http.html.ini        |   7 -
 .../unset/worker-module.http.html.ini         |   7 -
 .../unset/xhr.http.html.ini                   |  37 ---
 .../tests/switch_to_frame/switch.py.ini       |   3 +
 .../switch_to_frame/switch_number.py.ini      |  16 ++
 .../switch_to_frame/switch_webelement.py.ini  |   7 +
 .../webmessaging/with-ports/017.html.ini      |   5 +
 .../webmessaging/with-ports/018.html.ini      |   5 -
 .../webmessaging/without-ports/018.html.ini   |   5 -
 .../Worker/Worker-constructor.html.ini        |   2 +
 .../subresource/subresource.py                |   3 +-
 .../border-radius-clipping-002.html           |  38 +++
 .../border-radius-clipping.html               |  73 +++--
 .../reference/border-radius-clipping-ref.html |  50 ++--
 .../100x100-green-with-red-corners.png        | Bin 0 -> 1517 bytes
 .../selectors/old-tests/css3-modsel-23.xml    |  21 --
 .../selectors/old-tests/css3-modsel-24.xml    |  21 --
 .../selectors/old-tests/css3-modsel-68.xml    |  20 --
 .../selectors/old-tests/css3-modsel-69.xml    |  20 --
 .../selectors/pseudo-enabled-disabled.html    |  51 ++++
 .../media-elements/historical.html            |   2 +
 .../media-elements/pitch-detector.js          |  48 ++++
 .../media-elements/preserves-pitch.html       | 110 +++++++
 .../resources/not-embeddable.html             |   3 +
 .../resources/not-embeddable.html.headers     |   1 +
 .../embed-network-error.sub.html              |  54 ++++
 ...ntative.html => iframe-loading-eager.html} |   0
 ...ml => iframe-loading-lazy-base-url-2.html} |   0
 ...html => iframe-loading-lazy-base-url.html} |   0
 ...ml => iframe-loading-lazy-load-event.html} |   0
 ...> iframe-loading-lazy-multiple-times.html} |   0
 ...ading-lazy-referrerpolicy-change.sub.html} |   0
 ...html => iframe-loading-lazy-to-eager.html} |   0
 ...entative.html => iframe-loading-lazy.html} |   0
 .../iframe-network-error.sub.html             |  54 ++++
 .../dialog-form-submission.html               |  22 +-
 .../interfaces/appmanifest.idl                |   4 -
 .../interfaces/input-device-capabilities.idl  |   4 +-
 tests/wpt/web-platform-tests/lint.ignore      |   2 +
 .../mpadded/mpadded-002.html                  |  13 +-
 .../wpt/web-platform-tests/media/sine440.mp3  | Bin 0 -> 80666 bytes
 .../payment-is-showing.https.html             |   2 +-
 ...anmakepayment-method-protection.https.html |   2 +-
 .../resources/generate-test-sxgs.sh           |  16 ++
 .../sxg-subresource-mismatch-iframe.html      |  29 ++
 ...-subresource-header-integrity-mismatch.sxg | Bin 0 -> 996 bytes
 ...-header-integrity-mismatch.sxg.sub.headers |   1 +
 ...e-header-integrity-mismatch.tentative.html | 144 ++++++++++
 .../tools/wptrunner/requirements_firefox.txt  |   2 +-
 .../web-bundle/resources/dynamic/resource1.js |   1 +
 .../web-bundle/resources/dynamic/resource2.js |   1 +
 .../web-bundle/resources/dynamic/resource3.js |   1 +
 .../web-bundle/resources/dynamic/resource4.js |   1 +
 .../resources/dynamic1/resource1.js           |   1 +
 .../resources/dynamic1/resource2.js           |   1 +
 .../resources/dynamic1/resource3.js           |   1 +
 .../resources/dynamic1/resource4.js           |   1 +
 .../resources/dynamic2/resource1.js           |   1 +
 .../resources/dynamic2/resource2.js           |   1 +
 .../resources/dynamic2/resource3.js           |   1 +
 .../resources/dynamic2/resource4.js           |   1 +
 .../resources/generate-test-wbns.sh           |  28 +-
 .../web-bundle/resources/subresource/root.js  |   1 +
 .../resources/subresource/submodule.js        |   1 +
 .../web-bundle/resources/wbn/dynamic1.wbn     | Bin 0 -> 1201 bytes
 .../web-bundle/resources/wbn/dynamic2.wbn     | Bin 0 -> 1201 bytes
 .../web-bundle/resources/wbn/subresource.wbn  | Bin 0 -> 523 bytes
 ...rce-loading-from-web-bundle.tentative.html |  65 +++++
 .../share-consume-activation.https.html       |   2 +-
 .../web-share/share-empty.https.html          |   2 +-
 ...tps.html => share-files-manual.https.html} |   0
 .../web-share/share-url-invalid.https.html    |   2 +-
 .../tests/support/html/deleteframe.html       |   5 +
 .../webdriver/tests/support/html/frames.html  |  16 ++
 .../webdriver/tests/switch_to_frame/switch.py |  90 ++----
 .../tests/switch_to_frame/switch_number.py    |  51 ++++
 .../switch_to_frame/switch_webelement.py      |  85 ++++++
 1319 files changed, 2020 insertions(+), 24030 deletions(-)
 delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-backgrounds/border-radius-clipping-002.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-embed-element/embed-network-error.sub.html.ini
 rename tests/wpt/{metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.tentative.html.ini => metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.html.ini} (74%)
 rename tests/wpt/{metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.tentative.html.ini => metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.html.ini} (73%)
 rename tests/wpt/{metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.tentative.html.ini => metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.html.ini} (79%)
 rename tests/wpt/{metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.tentative.html.ini => metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.html.ini} (62%)
 rename tests/wpt/{metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.tentative.html.ini => metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.html.ini} (75%)
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-network-error.sub.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/a-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/a-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer/a-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/req.rel-noref/no-referrer/a-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/a-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webdriver/tests/switch_to_frame/switch.py.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webdriver/tests/switch_to_frame/switch_number.py.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webdriver/tests/switch_to_frame/switch_webelement.py.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
 create mode 100644 tests/wpt/metadata/css/css-backgrounds/border-radius-clipping-002.html.ini
 delete mode 100644 tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/the-embed-element/embed-network-error.sub.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.html.ini
 delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.tentative.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-network-error.sub.html.ini
 delete mode 100644 tests/wpt/metadata/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
 create mode 100644 tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/a-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/a-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/a-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/req.attr/origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/req.rel-noref/no-referrer/a-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/a-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/unset/img-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unset/worker-module.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html.ini
 create mode 100644 tests/wpt/metadata/webdriver/tests/switch_to_frame/switch_number.py.ini
 create mode 100644 tests/wpt/metadata/webdriver/tests/switch_to_frame/switch_webelement.py.ini
 create mode 100644 tests/wpt/metadata/webmessaging/with-ports/017.html.ini
 delete mode 100644 tests/wpt/metadata/webmessaging/with-ports/018.html.ini
 delete mode 100644 tests/wpt/metadata/webmessaging/without-ports/018.html.ini
 create mode 100644 tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
 create mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-clipping-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/support/100x100-green-with-red-corners.png
 delete mode 100644 tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-23.xml
 delete mode 100644 tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-24.xml
 delete mode 100644 tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-68.xml
 delete mode 100644 tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-69.xml
 create mode 100644 tests/wpt/web-platform-tests/css/selectors/pseudo-enabled-disabled.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/pitch-detector.js
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/preserves-pitch.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/embedded-content/resources/not-embeddable.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/embedded-content/resources/not-embeddable.html.headers
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-network-error.sub.html
 rename tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/{iframe-loading-eager.tentative.html => iframe-loading-eager.html} (100%)
 rename tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/{iframe-loading-lazy-base-url-2.tentative.html => iframe-loading-lazy-base-url-2.html} (100%)
 rename tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/{iframe-loading-lazy-base-url.tentative.html => iframe-loading-lazy-base-url.html} (100%)
 rename tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/{iframe-loading-lazy-load-event.tentative.html => iframe-loading-lazy-load-event.html} (100%)
 rename tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/{iframe-loading-lazy-multiple-times.tentative.html => iframe-loading-lazy-multiple-times.html} (100%)
 rename tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/{iframe-loading-lazy-referrerpolicy-change.sub.tentative.html => iframe-loading-lazy-referrerpolicy-change.sub.html} (100%)
 rename tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/{iframe-loading-lazy-to-eager.tentative.html => iframe-loading-lazy-to-eager.html} (100%)
 rename tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/{iframe-loading-lazy.tentative.html => iframe-loading-lazy.html} (100%)
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-network-error.sub.html
 create mode 100644 tests/wpt/web-platform-tests/media/sine440.mp3
 create mode 100644 tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-mismatch-iframe.html
 create mode 100644 tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource-header-integrity-mismatch.sxg
 create mode 100644 tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource-header-integrity-mismatch.sxg.sub.headers
 create mode 100644 tests/wpt/web-platform-tests/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/dynamic/resource1.js
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/dynamic/resource2.js
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/dynamic/resource3.js
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/dynamic/resource4.js
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource1.js
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource2.js
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource3.js
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource4.js
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource1.js
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource2.js
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource3.js
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource4.js
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/subresource/root.js
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/subresource/submodule.js
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1.wbn
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic2.wbn
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/wbn/subresource.wbn
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-from-web-bundle.tentative.html
 rename tests/wpt/web-platform-tests/web-share/{share-files-manual.tentative.https.html => share-files-manual.https.html} (100%)
 create mode 100644 tests/wpt/web-platform-tests/webdriver/tests/support/html/deleteframe.html
 create mode 100644 tests/wpt/web-platform-tests/webdriver/tests/support/html/frames.html
 create mode 100644 tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch_number.py
 create mode 100644 tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch_webelement.py

diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
deleted file mode 100644
index baa9f1a7541..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-005.html]
-  [Miss clipped float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-radius-clipping-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-radius-clipping-002.html.ini
new file mode 100644
index 00000000000..2a83b8565ee
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-radius-clipping-002.html.ini
@@ -0,0 +1,2 @@
+[border-radius-clipping-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
deleted file mode 100644
index 4c79907309b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
new file mode 100644
index 00000000000..e38782d8c85
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
@@ -0,0 +1,4 @@
+[elementFromPoint-001.html]
+  [CSSOM View - 5 - extensions to the Document interface]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
new file mode 100644
index 00000000000..e6e1f29e274
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
@@ -0,0 +1,2 @@
+[matchMedia-display-none-iframe.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index 6df87a1f1ec..9b495819fa1 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -312,18 +312,21 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index d2df9b78483..258fe374697 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -56,3 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
+  [separate text/javascript ]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 70efd28ddfc..369bf4d4fa4 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
+  [Content-Type-Options%3A%20nosniff]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
new file mode 100644
index 00000000000..735a9a75a2a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
@@ -0,0 +1,2 @@
+[cross-origin-objects-on-new-window.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 5c3ac06f42a..09ae27d7480 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -171,3 +171,6 @@
   [XHTML img usemap="#hash-id"]
     expected: FAIL
 
+  [HTML (standards) IMG usemap="no-hash-name"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-embed-element/embed-network-error.sub.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-embed-element/embed-network-error.sub.html.ini
new file mode 100644
index 00000000000..f060f90f0bb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-embed-element/embed-network-error.sub.html.ini
@@ -0,0 +1,14 @@
+[embed-network-error.sub.html]
+  expected: TIMEOUT
+  [new embed: nonexistent host]
+    expected: TIMEOUT
+
+  [navigating an existing embed: nonexistent host]
+    expected: TIMEOUT
+
+  [navigating an existing embed: X-Frame-Options prevents embedding]
+    expected: TIMEOUT
+
+  [new embed: X-Frame-Options prevents embedding]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.tentative.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.html.ini
similarity index 74%
rename from tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.tentative.html.ini
rename to tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.html.ini
index 21645a8a023..1fc910c1016 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.tentative.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.html.ini
@@ -1,4 +1,4 @@
-[iframe-loading-lazy-base-url.tentative.html]
+[iframe-loading-lazy-base-url-2.html]
   [When a loading=lazy iframe is loaded, it loads relative to the document's base URL computed at parse-time.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.tentative.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.html.ini
similarity index 73%
rename from tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.tentative.html.ini
rename to tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.html.ini
index 3a2f3d05e88..1551aadc185 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.tentative.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.html.ini
@@ -1,4 +1,4 @@
-[iframe-loading-lazy-base-url-2.tentative.html]
+[iframe-loading-lazy-base-url.html]
   [When a loading=lazy iframe is loaded, it loads relative to the document's base URL computed at parse-time.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.tentative.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.html.ini
similarity index 79%
rename from tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.tentative.html.ini
rename to tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.html.ini
index 695d4c26829..38cbe9fb4ad 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.tentative.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.html.ini
@@ -1,4 +1,4 @@
-[iframe-loading-lazy-load-event.tentative.html]
+[iframe-loading-lazy-load-event.html]
   [In-viewport loading=lazy visibility:hidden iframe does not block the load event]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.tentative.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.html.ini
similarity index 62%
rename from tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.tentative.html.ini
rename to tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.html.ini
index 3adec8635f8..27a6fdcabe6 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.tentative.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.html.ini
@@ -1,4 +1,4 @@
-[iframe-loading-lazy-multiple-times.tentative.html]
+[iframe-loading-lazy-multiple-times.html]
   [Iframes with loading='lazy' can be lazy loaded multiple times]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.tentative.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.html.ini
similarity index 75%
rename from tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.tentative.html.ini
rename to tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.html.ini
index 342b9d69c14..37656d7bb4d 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.tentative.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.html.ini
@@ -1,4 +1,4 @@
-[iframe-loading-lazy-to-eager.tentative.html]
+[iframe-loading-lazy-to-eager.html]
   [Below-viewport iframes with loading='lazy' load when set to loading='eager' or the `loading` attribute is removed]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.html.ini
new file mode 100644
index 00000000000..cb08121bd97
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.html.ini
@@ -0,0 +1,7 @@
+[iframe-loading-lazy.html]
+  [Below-viewport srcdoc iframes load lazily]
+    expected: FAIL
+
+  [Below-viewport iframes load lazily]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-network-error.sub.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-network-error.sub.html.ini
new file mode 100644
index 00000000000..6d62deddc8d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe-network-error.sub.html.ini
@@ -0,0 +1,7 @@
+[iframe-network-error.sub.html]
+  [navigating an existing iframe: nonexistent host]
+    expected: FAIL
+
+  [navigating an existing iframe: X-Frame-Options prevents embedding]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 88f4ddd0e9a..42ebcc9d57e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-1.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index c6f45be1eb2..e63fe7c263e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 3080be9afc0..d913fcbb129 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 0407f0cc2b7..0218bc9ba9d 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
deleted file mode 100644
index bcd2fd0eab8..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[077.html]
-  [ adding several types of scripts through the DOM and removing some of them confuses scheduler ]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
new file mode 100644
index 00000000000..fca4d908c89
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-static-import-delayed.html]
+  [document.write in an imported module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 450c88bd32b..5602ea31dbe 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -4,5 +4,5 @@
     expected: TIMEOUT
 
   [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
index 5bc8e9f3157..297595743a6 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
@@ -1,10 +1,9 @@
 [promise-job-entry-different-function-realm.html]
-  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Thenable resolution]
     expected: FAIL
@@ -13,5 +12,5 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/4K/gen/top.meta/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/a-tag.http.html.ini
deleted file mode 100644
index eeb9e696900..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/a-tag.http.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[a-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/iframe-tag.http.html.ini
deleted file mode 100644
index 17cf7b6cca8..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/img-tag.http.html.ini
deleted file mode 100644
index 64bfd8254ac..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/script-tag.http.html.ini
deleted file mode 100644
index be04a32349c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/xhr.http.html.ini
deleted file mode 100644
index 283fc71627c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/no-referrer/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/a-tag.http.html.ini
index e209c5b1c05..724084b8d34 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/fetch.http.html.ini
index c3cd1fe7552..68c7e9a360c 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/fetch.http.html.ini
@@ -14,9 +14,6 @@
   [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
@@ -32,6 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 17f41a4f66c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index a2493595009..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index 00fb4fb96db..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/a-tag.http.html.ini
index 7f2bbec3d55..c3ae9ab455e 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/iframe-tag.http.html.ini
deleted file mode 100644
index 09fd9d01e1a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/script-tag.http.html.ini
deleted file mode 100644
index 4ffb4355b3f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/xhr.http.html.ini
deleted file mode 100644
index c0c4d2fb7cf..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/a-tag.http.html.ini
index d430b1582ea..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/a-tag.http.html.ini
@@ -1,11 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/fetch.http.html.ini
index 28103faf864..cfc7c7d7944 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/fetch.http.html.ini
@@ -11,18 +11,12 @@
   [Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
   [Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 8ccc993ecf9..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/img-tag.http.html.ini
deleted file mode 100644
index 9a8364a563d..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 9fc3de3fd81..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/xhr.http.html.ini
deleted file mode 100644
index b948e6e7368..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
index e209c5b1c05..724084b8d34 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
index c3cd1fe7552..68c7e9a360c 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
@@ -14,9 +14,6 @@
   [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
@@ -32,6 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 17f41a4f66c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index a2493595009..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index 00fb4fb96db..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/a-tag.http.html.ini
index 7f2bbec3d55..c3ae9ab455e 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 09fd9d01e1a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/script-tag.http.html.ini
deleted file mode 100644
index 4ffb4355b3f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/xhr.http.html.ini
deleted file mode 100644
index c0c4d2fb7cf..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/strict-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/a-tag.http.html.ini
deleted file mode 100644
index eeb9e696900..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/a-tag.http.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[a-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/iframe-tag.http.html.ini
deleted file mode 100644
index 17cf7b6cca8..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/img-tag.http.html.ini
deleted file mode 100644
index 64bfd8254ac..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/script-tag.http.html.ini
deleted file mode 100644
index be04a32349c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/xhr.http.html.ini
deleted file mode 100644
index 283fc71627c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/no-referrer/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/a-tag.http.html.ini
index e209c5b1c05..724084b8d34 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/fetch.http.html.ini
index c3cd1fe7552..68c7e9a360c 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/fetch.http.html.ini
@@ -14,9 +14,6 @@
   [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
@@ -32,6 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 17f41a4f66c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index a2493595009..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index 00fb4fb96db..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/a-tag.http.html.ini
index 7f2bbec3d55..c3ae9ab455e 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/iframe-tag.http.html.ini
deleted file mode 100644
index 09fd9d01e1a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/script-tag.http.html.ini
deleted file mode 100644
index 4ffb4355b3f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/xhr.http.html.ini
deleted file mode 100644
index c0c4d2fb7cf..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/a-tag.http.html.ini
index d430b1582ea..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/a-tag.http.html.ini
@@ -1,11 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/fetch.http.html.ini
index 28103faf864..cfc7c7d7944 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/fetch.http.html.ini
@@ -11,18 +11,12 @@
   [Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
   [Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 8ccc993ecf9..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/img-tag.http.html.ini
deleted file mode 100644
index 9a8364a563d..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 9fc3de3fd81..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/xhr.http.html.ini
deleted file mode 100644
index b948e6e7368..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
index e209c5b1c05..724084b8d34 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/fetch.http.html.ini
index c3cd1fe7552..68c7e9a360c 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/fetch.http.html.ini
@@ -14,9 +14,6 @@
   [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
@@ -32,6 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 17f41a4f66c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index a2493595009..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index 00fb4fb96db..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/a-tag.http.html.ini
index 7f2bbec3d55..c3ae9ab455e 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 09fd9d01e1a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/script-tag.http.html.ini
deleted file mode 100644
index 4ffb4355b3f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/xhr.http.html.ini
deleted file mode 100644
index c0c4d2fb7cf..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/strict-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/iframe.meta/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag.http.html.ini
index b26f466bc2a..9fd6bb86336 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag.http.html.ini
@@ -1,38 +1,37 @@
 [iframe-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer/a-tag.http.html.ini
deleted file mode 100644
index eeb9e696900..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer/a-tag.http.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[a-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html.ini
index 17cf7b6cca8..7408079db11 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html.ini
@@ -1,38 +1,37 @@
 [iframe-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer/img-tag.http.html.ini
deleted file mode 100644
index 64bfd8254ac..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/no-referrer/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag.http.html.ini
index e209c5b1c05..724084b8d34 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html.ini
index 17f41a4f66c..8df0cb96ad8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html.ini
@@ -1,38 +1,37 @@
 [iframe-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin/a-tag.http.html.ini
index 7f2bbec3d55..c3ae9ab455e 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin/iframe-tag.http.html.ini
index 09fd9d01e1a..9a2b984a0a8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin/iframe-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin/iframe-tag.http.html.ini
@@ -1,38 +1,37 @@
 [iframe-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/same-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/same-origin/a-tag.http.html.ini
index d430b1582ea..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/same-origin/a-tag.http.html.ini
@@ -1,11 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html.ini
index 8ccc993ecf9..425cfe1a6d7 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html.ini
@@ -1,32 +1,7 @@
 [iframe-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/same-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/same-origin/img-tag.http.html.ini
deleted file mode 100644
index 9a8364a563d..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/same-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/same-origin/script-tag.http.html.ini
index 9fc3de3fd81..c4bbadf2463 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/same-origin/script-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/same-origin/script-tag.http.html.ini
@@ -1,31 +1,7 @@
 [script-tag.http.html]
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag.http.html.ini
index e209c5b1c05..724084b8d34 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html.ini
index 17f41a4f66c..8df0cb96ad8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html.ini
@@ -1,38 +1,37 @@
 [iframe-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin/a-tag.http.html.ini
index 7f2bbec3d55..c3ae9ab455e 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html.ini
index 09fd9d01e1a..9a2b984a0a8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html.ini
@@ -1,38 +1,37 @@
 [iframe-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/strict-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/unsafe-url/iframe-tag.http.html.ini
index b26f466bc2a..9fd6bb86336 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/unsafe-url/iframe-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/unsafe-url/iframe-tag.http.html.ini
@@ -1,38 +1,37 @@
 [iframe-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.attr/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.rel-noref/no-referrer/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.rel-noref/no-referrer/a-tag.http.html.ini
deleted file mode 100644
index eeb9e696900..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/req.rel-noref/no-referrer/a-tag.http.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[a-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html.ini
deleted file mode 100644
index eeb9e696900..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[a-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html.ini
deleted file mode 100644
index 17cf7b6cca8..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html.ini
deleted file mode 100644
index 64bfd8254ac..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html.ini
deleted file mode 100644
index be04a32349c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html.ini
deleted file mode 100644
index 283fc71627c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
index e209c5b1c05..724084b8d34 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
index c3cd1fe7552..68c7e9a360c 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
@@ -14,9 +14,6 @@
   [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
@@ -32,6 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 17f41a4f66c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index a2493595009..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index 00fb4fb96db..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/a-tag.http.html.ini
index 7f2bbec3d55..c3ae9ab455e 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html.ini
deleted file mode 100644
index 09fd9d01e1a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/script-tag.http.html.ini
deleted file mode 100644
index 4ffb4355b3f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/xhr.http.html.ini
deleted file mode 100644
index c0c4d2fb7cf..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html.ini
index d430b1582ea..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html.ini
@@ -1,11 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html.ini
index 28103faf864..cfc7c7d7944 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html.ini
@@ -11,18 +11,12 @@
   [Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
   [Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 8ccc993ecf9..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html.ini
deleted file mode 100644
index 9a8364a563d..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 9fc3de3fd81..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html.ini
deleted file mode 100644
index b948e6e7368..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
index e209c5b1c05..724084b8d34 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
index c3cd1fe7552..68c7e9a360c 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
@@ -14,9 +14,6 @@
   [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
@@ -32,6 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 17f41a4f66c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index a2493595009..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index 00fb4fb96db..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html.ini
index 7f2bbec3d55..c3ae9ab455e 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 09fd9d01e1a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html.ini
deleted file mode 100644
index 4ffb4355b3f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html.ini
deleted file mode 100644
index c0c4d2fb7cf..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.http-rp/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/a-tag.http.html.ini
deleted file mode 100644
index eeb9e696900..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/a-tag.http.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[a-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/iframe-tag.http.html.ini
deleted file mode 100644
index 17cf7b6cca8..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/img-tag.http.html.ini
deleted file mode 100644
index 64bfd8254ac..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/script-tag.http.html.ini
deleted file mode 100644
index be04a32349c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/xhr.http.html.ini
deleted file mode 100644
index 283fc71627c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/no-referrer/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
index e209c5b1c05..724084b8d34 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
index c3cd1fe7552..68c7e9a360c 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
@@ -14,9 +14,6 @@
   [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
@@ -32,6 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 17f41a4f66c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index a2493595009..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index 00fb4fb96db..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/a-tag.http.html.ini
index 7f2bbec3d55..c3ae9ab455e 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/iframe-tag.http.html.ini
deleted file mode 100644
index 09fd9d01e1a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/script-tag.http.html.ini
deleted file mode 100644
index 4ffb4355b3f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/xhr.http.html.ini
deleted file mode 100644
index c0c4d2fb7cf..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/a-tag.http.html.ini
index d430b1582ea..99c7b7566f8 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/a-tag.http.html.ini
@@ -1,11 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/fetch.http.html.ini
index 28103faf864..cfc7c7d7944 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/fetch.http.html.ini
@@ -11,18 +11,12 @@
   [Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
   [Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 8ccc993ecf9..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/img-tag.http.html.ini
deleted file mode 100644
index 9a8364a563d..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 9fc3de3fd81..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/xhr.http.html.ini
deleted file mode 100644
index b948e6e7368..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
index e209c5b1c05..724084b8d34 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
index c3cd1fe7552..68c7e9a360c 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
@@ -14,9 +14,6 @@
   [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
@@ -32,6 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 17f41a4f66c..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index a2493595009..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index 00fb4fb96db..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/a-tag.http.html.ini
index 7f2bbec3d55..c3ae9ab455e 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 09fd9d01e1a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/script-tag.http.html.ini
deleted file mode 100644
index 4ffb4355b3f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/xhr.http.html.ini
deleted file mode 100644
index c0c4d2fb7cf..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/strict-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/a-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/iframe-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/img-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/script-tag.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/top.meta/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch.http.html.ini
index c3cd1fe7552..68c7e9a360c 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch.http.html.ini
@@ -14,9 +14,6 @@
   [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
@@ -32,6 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr.http.html.ini
index 00fb4fb96db..b30686cae0c 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr.http.html.ini
@@ -11,18 +11,12 @@
   [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
   [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch.http.html.ini
index 28103faf864..cfc7c7d7944 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch.http.html.ini
@@ -11,18 +11,12 @@
   [Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
   [Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr.http.html.ini
index b948e6e7368..08ff988b50a 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr.http.html.ini
@@ -1,7 +1,4 @@
 [xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.]
     expected: FAIL
 
@@ -14,9 +11,6 @@
   [Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
index c3cd1fe7552..68c7e9a360c 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
@@ -14,9 +14,6 @@
   [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
@@ -32,6 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
index 00fb4fb96db..b30686cae0c 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
@@ -11,18 +11,12 @@
   [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
   [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
   [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unset/worker-module.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata-layout-2020/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/switch_to_frame/switch.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/switch_to_frame/switch.py.ini
new file mode 100644
index 00000000000..3ae0bdc9e8e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/switch_to_frame/switch.py.ini
@@ -0,0 +1,7 @@
+[switch.py]
+  [test_frame_deleted]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: ERROR
+
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/switch_to_frame/switch_number.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/switch_to_frame/switch_number.py.ini
new file mode 100644
index 00000000000..67a9320f98c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/switch_to_frame/switch_number.py.ini
@@ -0,0 +1,16 @@
+[switch_number.py]
+  [test_frame_id_number_index[1-bar\]]
+    expected: FAIL
+
+  [test_frame_id_number_index_nested]
+    expected: FAIL
+
+  [test_frame_id_number_index_out_of_bounds[65535\]]
+    expected: FAIL
+
+  [test_frame_id_number_index[0-foo\]]
+    expected: FAIL
+
+  [test_frame_id_number_index_out_of_bounds[1\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/switch_to_frame/switch_webelement.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/switch_to_frame/switch_webelement.py.ini
new file mode 100644
index 00000000000..5ed6b633e40
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/switch_to_frame/switch_webelement.py.ini
@@ -0,0 +1,7 @@
+[switch_webelement.py]
+  [test_frame_id_webelement_frame[1-bar\]]
+    expected: FAIL
+
+  [test_frame_id_webelement_frame[0-foo\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index ea70a752862..382c6f8e819 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -24078,7 +24078,7 @@
       {}
      ]
     ],
-    "share-files-manual.tentative.https.html": [
+    "share-files-manual.https.html": [
      "c3941bb4065b28c7f8fd4f615b8ec595ea5281a7",
      [
       null,
@@ -123155,8 +123155,21 @@
        {}
       ]
      ],
+     "border-radius-clipping-002.html": [
+      "eea0ee104fc2610a722f5bbae200c8f6d1ac9823",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-nothing-below.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "border-radius-clipping.html": [
-      "62da6394c40740b0a864355b0158064cbee60e33",
+      "331bc61f20392a7f815014b738a7e01ea92db850",
       [
        null,
        [
@@ -250754,7 +250767,7 @@
        []
       ],
       "subresource.py": [
-       "a003a3342fb7c6588aa012e37998d25135fa740d",
+       "0416c324b31de08fe95bd955129793c6d750324c",
        []
       ],
       "svg.py": [
@@ -291178,7 +291191,7 @@
        []
       ],
       "border-radius-clipping-ref.html": [
-       "e524aff19d0be337ecbfa3ad8d62f5f8d4b292a4",
+       "344cd01c7a1b339cb7edbd8cd050b2180507abc9",
        []
       ],
       "border-radius-horizontal-value-is-zero-ref.html": [
@@ -291341,6 +291354,10 @@
        "70437d7bda2b56a921b523d4a81ca4df7be4321d",
        []
       ],
+      "100x100-green-with-red-corners.png": [
+       "a193937c0d017b4b497a68874468fa92123f223e",
+       []
+      ],
       "100x100-red.png": [
        "57bf3ddc5213d06e0975de38f330ffb7c441b268",
        []
@@ -334544,6 +334561,10 @@
          ]
         }
        },
+       "pitch-detector.js": [
+        "595bde3120c7307244c1f4b70eeca3adceac1dd7",
+        []
+       ],
        "track": {
         "track-element": {
          "cors": {
@@ -334904,6 +334925,14 @@
         "06f18b3e0498549df1811c6a8008857e65b4117c",
         []
        ],
+       "not-embeddable.html": [
+        "a941511642ae5ef473717232e7c7a9de531f7f14",
+        []
+       ],
+       "not-embeddable.html.headers": [
+        "fa717cc748e32fadd3bbcf44a249c373d204c582",
+        []
+       ],
        "should-load.html": [
         "a9a178ce51ed7241d30755fe32b7003680f628c8",
         []
@@ -338748,7 +338777,7 @@
      []
     ],
     "appmanifest.idl": [
-     "926a4fc2022e71c28aa4a2ae3d1adc12104ee1ab",
+     "0d24849b9f7657aed65b8d1dd147cf7001e26599",
      []
     ],
     "audio-output.idl": [
@@ -338992,7 +339021,7 @@
      []
     ],
     "input-device-capabilities.idl": [
-     "86015b30dbda40866a945f0599d2e5db99b1d2ec",
+     "36fdbd21c4226b5c2cb5a7f30c32561c877e20c0",
      []
     ],
     "input-events.idl": [
@@ -339585,7 +339614,7 @@
     ]
    },
    "lint.ignore": [
-    "23cf8609bf254070786af58f19deb901c37b7aee",
+    "40b7cb2c2180de0227a5803f4fd6b69ee8dc2c78",
     []
    ],
    "loading": {
@@ -340435,6 +340464,10 @@
      "bf6e253b3df4dcc8981562b126bdfd58459a128d",
      []
     ],
+    "sine440.mp3": [
+     "4ded8b338025da1b6bec8d0c25d376bcaed5a64a",
+     []
+    ],
     "sound_0.mp3": [
      "a15d1de328f3f3325cb9589d423abf60d538d838",
      []
@@ -347853,7 +347886,7 @@
       []
      ],
      "generate-test-sxgs.sh": [
-      "73c20801a0c82c2ab229693caae4e430ac3552f2",
+      "e3988ce683dad77fd2dd8ed0ba5bf94426acb9d4",
       []
      ],
      "inner-url.html": [
@@ -348005,6 +348038,14 @@
        "cc7793efa287b21d10c8c92dcd371a7938b31686",
        []
       ],
+      "sxg-subresource-header-integrity-mismatch.sxg": [
+       "ace89dde642621ab8ce7cee7dc2e04c52cf1754f",
+       []
+      ],
+      "sxg-subresource-header-integrity-mismatch.sxg.sub.headers": [
+       "8f1b47ef068c6aee02d9df3342c9ac1fc3b4d3b5",
+       []
+      ],
       "sxg-subresource-script.sxg": [
        "fe1bd976456bafa7584a32bcb4d97fba398b0d4b",
        []
@@ -348054,6 +348095,10 @@
       "bd812857b46a24a69d1c7bb76917fad2e03e4342",
       []
      ],
+     "sxg-subresource-mismatch-iframe.html": [
+      "f05fcc99f83a5715f88b198a8e90ea4d5637107a",
+      []
+     ],
      "sxg-subresource-script-inner.js": [
       "dcc7a356a0a222b3cf4064f2aeb5a40c9a209338",
       []
@@ -355977,7 +356022,7 @@
       []
      ],
      "requirements_firefox.txt": [
-      "2731feda5c01feb77d2bebfd3b73a247debc7d0c",
+      "21906c57fd263500fcf7bf377219ed7506b71d9a",
       []
      ],
      "requirements_ie.txt": [
@@ -357928,8 +357973,62 @@
      []
     ],
     "resources": {
+     "dynamic": {
+      "resource1.js": [
+       "7bd437364a24b6e94493c2acca939991b15cd41c",
+       []
+      ],
+      "resource2.js": [
+       "09a4ee7b704d4f6b895d898eb68ca5d8f874f17b",
+       []
+      ],
+      "resource3.js": [
+       "851168c9dac34f49b9f12a9620277c9cfc9d4c1f",
+       []
+      ],
+      "resource4.js": [
+       "ea456b8db0a411a6a5ade3c556a5e8c3e7415ef4",
+       []
+      ]
+     },
+     "dynamic1": {
+      "resource1.js": [
+       "6fd1de600e5599bfe4740b06da6d089e65838f55",
+       []
+      ],
+      "resource2.js": [
+       "3cf012b21a198c17a13dbfd2042cab6510955c4b",
+       []
+      ],
+      "resource3.js": [
+       "c8a4e258b8af018bfa524f58d6969931d6b185a0",
+       []
+      ],
+      "resource4.js": [
+       "0b2f7920b01165f468e82fd79952870acc6d3c4a",
+       []
+      ]
+     },
+     "dynamic2": {
+      "resource1.js": [
+       "c6f751cec49ebe67e3a9a827ef3764ab730a6f17",
+       []
+      ],
+      "resource2.js": [
+       "b4278ee1c18bb43833fceee30c9d2c27842f2592",
+       []
+      ],
+      "resource3.js": [
+       "0dad7ea7bf9ea190a266f9e8f7b73478220ac0c2",
+       []
+      ],
+      "resource4.js": [
+       "e51cf7f5dc17557c7030cc10f7f78e2712b01677",
+       []
+      ]
+     },
      "generate-test-wbns.sh": [
-      "820bb12267c7cd1886d3f9771f24fec46433a370",
+      "c3dd8ebc72015ac607e73769f036f5169b720149",
       []
      ],
      "location": {
@@ -357942,14 +358041,36 @@
        []
       ]
      },
+     "subresource": {
+      "root.js": [
+       "2c2a465472b9a879a6298a969e2baf717d651535",
+       []
+      ],
+      "submodule.js": [
+       "4561aaf014fbc04a296a0c2011e3e4029ad76ba2",
+       []
+      ]
+     },
      "wbn": {
       "__dir__.headers": [
        "21e57b9caca1183ecda6f5d4fb9ebd556abf769a",
        []
       ],
+      "dynamic1.wbn": [
+       "22db19e7ce14d40cc4ba87d120486c24da1a4070",
+       []
+      ],
+      "dynamic2.wbn": [
+       "44c4b1ee86662af2b474447335267cf7b274e62b",
+       []
+      ],
       "location.wbn": [
        "1129cc1e92c89b5b33c86dde61bab7e66c8379bd",
        []
+      ],
+      "subresource.wbn": [
+       "395039dc216250729ed75bdab2c10a7f16998f16",
+       []
       ]
      }
     }
@@ -358843,6 +358964,16 @@
        "8bc53e7b4030dfdc6a78d11cb95915ea081eae73",
        []
       ],
+      "html": {
+       "deleteframe.html": [
+        "e0063fd1b0ffb8b2807bddeb72aa455c44066a10",
+        []
+       ],
+       "frames.html": [
+        "2019485529f64c778081b542646d36b55e4c4a39",
+        []
+       ]
+      },
       "http_request.py": [
        "895d1319ac0ac8b9a63defcb73f303c4a31e80bd",
        []
@@ -412881,6 +413012,13 @@
        {}
       ]
      ],
+     "pseudo-enabled-disabled.html": [
+      "521767de3763130f22e066c01d38fb7e83cb3de9",
+      [
+       null,
+       {}
+      ]
+     ],
      "scope-selector.html": [
       "0340f25919f34aaad07d53d1550d5155f73fb26b",
       [
@@ -460330,7 +460468,7 @@
         ]
        ],
        "historical.html": [
-        "d98a74df4e158d65672520a4eedb6929c76442ea",
+        "d7395632eb909722117dea9dbcf0f74d095ec865",
         [
          null,
          {}
@@ -461054,6 +461192,15 @@
          {}
         ]
        ],
+       "preserves-pitch.html": [
+        "9a86cbc210b296a131d60f26cb7288b870cf096b",
+        [
+         null,
+         {
+          "testdriver": true
+         }
+        ]
+       ],
        "ready-states": {
         "autoplay-hidden.optional.html": [
          "c009f55bfcad3efe7bb8681b048f23f757ba8e03",
@@ -463067,6 +463214,13 @@
          {}
         ]
        ],
+       "embed-network-error.sub.html": [
+        "bae995c101fd2d9d886c918f25fa711c1289559d",
+        [
+         null,
+         {}
+        ]
+       ],
        "historical.html": [
         "9df7280bb6065eaa188c637400fdd8ef609345b7",
         [
@@ -463162,62 +463316,69 @@
          {}
         ]
        ],
-       "iframe-loading-eager.tentative.html": [
+       "iframe-loading-eager.html": [
         "8acd99d23d569704a18d0a1cea13cb605b09c438",
         [
          null,
          {}
         ]
        ],
-       "iframe-loading-lazy-base-url-2.tentative.html": [
+       "iframe-loading-lazy-base-url-2.html": [
         "8782f3d315e47b2937f3e09154f63f1f7eb0cfbf",
         [
          null,
          {}
         ]
        ],
-       "iframe-loading-lazy-base-url.tentative.html": [
+       "iframe-loading-lazy-base-url.html": [
         "ec9f73400de7e25bd5f2dbfa42b249d34620187b",
         [
          null,
          {}
         ]
        ],
-       "iframe-loading-lazy-load-event.tentative.html": [
+       "iframe-loading-lazy-load-event.html": [
         "bf98bf7585cf608e6ebb46d025663e22bce8324c",
         [
          null,
          {}
         ]
        ],
-       "iframe-loading-lazy-multiple-times.tentative.html": [
+       "iframe-loading-lazy-multiple-times.html": [
         "89e41e61bf7fcac2b5f35990f7ad70a9fdab8424",
         [
          null,
          {}
         ]
        ],
-       "iframe-loading-lazy-referrerpolicy-change.sub.tentative.html": [
+       "iframe-loading-lazy-referrerpolicy-change.sub.html": [
         "68734d5708da40b7e5e533cb2ddee41c8a3d719f",
         [
          null,
          {}
         ]
        ],
-       "iframe-loading-lazy-to-eager.tentative.html": [
+       "iframe-loading-lazy-to-eager.html": [
         "371601a8c3a167e91804945fefe6db3154483cd2",
         [
          null,
          {}
         ]
        ],
-       "iframe-loading-lazy.tentative.html": [
+       "iframe-loading-lazy.html": [
         "51b442695e01e9496ee4f5754023f722e6636f36",
         [
          null,
          {}
         ]
        ],
+       "iframe-network-error.sub.html": [
+        "4dd3012af46a12aef1ff6e67fec27822b853bed4",
+        [
+         null,
+         {}
+        ]
+       ],
        "iframe-nosrc.html": [
         "57189a0b884d3a55e4bb2ba1a1d3aa83066c0eb3",
         [
@@ -466193,7 +466354,7 @@
         ]
        ],
        "dialog-form-submission.html": [
-        "3ed9dad92341ec4c023385e50bc6087a236e42d1",
+        "bc3706c4521208466283622af4ffe32655d6bfbd",
         [
          null,
          {
@@ -476162,7 +476323,7 @@
        ]
       ],
       "mpadded-002.html": [
-       "c3cbf7c435fd5b942b2c2528a9582c0b849d6e5d",
+       "5eed04bb0f599998db531bb56badf07e59129a11",
        [
         null,
         {}
@@ -484489,7 +484650,7 @@
      ]
     ],
     "payment-is-showing.https.html": [
-     "0ea02808ee2a12013e41e819da323fedf8d853ff",
+     "d5e04a83d0d34b5fa408287ef8f8ff1e1722e7e3",
      [
       null,
       {
@@ -484508,7 +484669,7 @@
      ]
     ],
     "payment-request-canmakepayment-method-protection.https.html": [
-     "e221034dd4ebd05c5bd701e05a81895b8457c3b7",
+     "9c068dfe001e35d57783a0e99f3d6edd50cc5795",
      [
       null,
       {
@@ -503146,6 +503307,13 @@
      ]
     },
     "subresource": {
+     "sxg-subresource-header-integrity-mismatch.tentative.html": [
+      "8a26b210a09410474fd149de81f04a43b6081683",
+      [
+       null,
+       {}
+      ]
+     ],
      "sxg-subresource.tentative.html": [
       "8ca12b4cbcf3c0950c04deed96e7174247444a25",
       [
@@ -518534,6 +518702,13 @@
        null,
        {}
       ]
+     ],
+     "subresource-loading-from-web-bundle.tentative.html": [
+      "e35264698dbf7f42feb1012195a791adcbdb5b16",
+      [
+       null,
+       {}
+      ]
      ]
     },
     "wbn-from-network": {
@@ -519771,7 +519946,7 @@
      ]
     ],
     "share-consume-activation.https.html": [
-     "ba14117c1d95780e9aa4f79755f567a63f77eee5",
+     "4b4ecd560c6746dd4d1902ffa36388fbf92a9796",
      [
       null,
       {
@@ -519780,7 +519955,7 @@
      ]
     ],
     "share-empty.https.html": [
-     "d0e0241ae44e51295b49245b386980d06c1d5668",
+     "c8fbb8ad451fdc6eb8779a2788ca1d41ed61aaab",
      [
       null,
       {
@@ -519805,7 +519980,7 @@
      ]
     ],
     "share-url-invalid.https.html": [
-     "e4af03d4c8822bcd8933c93ea2781915a3725603",
+     "5eae8e89426b4889d6f987a25db24a840d583f71",
      [
       null,
       {
@@ -558278,20 +558453,6 @@
         {}
        ]
       ],
-      "css3-modsel-23.xml": [
-       "663ec09ef2c4db8ae168553bdc99c27748ec6cd8",
-       [
-        null,
-        {}
-       ]
-      ],
-      "css3-modsel-24.xml": [
-       "d20a0116f74ff10e119a6035f1b1bc97eb291223",
-       [
-        null,
-        {}
-       ]
-      ],
       "css3-modsel-25.xml": [
        "ef1875fc89e68906ae1a8ad949e931005c81b964",
        [
@@ -558642,20 +558803,6 @@
         {}
        ]
       ],
-      "css3-modsel-68.xml": [
-       "99c28261381b13ff28c907f2ae161b018beb7c32",
-       [
-        null,
-        {}
-       ]
-      ],
-      "css3-modsel-69.xml": [
-       "3da2a7f43c55620fdf19c3d8788b64895fd18d91",
-       [
-        null,
-        {}
-       ]
-      ],
       "css3-modsel-7.xml": [
        "a464ccdb771462e68ee22bd3fc2f6e0dd05215d2",
        [
@@ -560293,7 +560440,21 @@
        ]
       ],
       "switch.py": [
-       "f9b0e6fc1fcd16c9f9e66b05149930f6ee0ae346",
+       "723c48c3e851439744169c5e9a3e0c490d652f95",
+       [
+        null,
+        {}
+       ]
+      ],
+      "switch_number.py": [
+       "77529544679aacdc30bb2c36eb553808ed5edac6",
+       [
+        null,
+        {}
+       ]
+      ],
+      "switch_webelement.py": [
+       "89480b66b3a66e171d8e04eb6cff65c0f8d55b62",
        [
         null,
         {}
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
deleted file mode 100644
index baa9f1a7541..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-005.html]
-  [Miss clipped float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-backgrounds/border-radius-clipping-002.html.ini b/tests/wpt/metadata/css/css-backgrounds/border-radius-clipping-002.html.ini
new file mode 100644
index 00000000000..2a83b8565ee
--- /dev/null
+++ b/tests/wpt/metadata/css/css-backgrounds/border-radius-clipping-002.html.ini
@@ -0,0 +1,2 @@
+[border-radius-clipping-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
deleted file mode 100644
index 4c79907309b..00000000000
--- a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
new file mode 100644
index 00000000000..e38782d8c85
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
@@ -0,0 +1,4 @@
+[elementFromPoint-001.html]
+  [CSSOM View - 5 - extensions to the Document interface]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
new file mode 100644
index 00000000000..e6e1f29e274
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
@@ -0,0 +1,2 @@
+[matchMedia-display-none-iframe.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 64f0782e982..72d7eb5cf1c 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,18 +312,21 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index d2df9b78483..258fe374697 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,3 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
+  [separate text/javascript ]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 70efd28ddfc..369bf4d4fa4 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
+  [Content-Type-Options%3A%20nosniff]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
new file mode 100644
index 00000000000..735a9a75a2a
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
@@ -0,0 +1,2 @@
+[cross-origin-objects-on-new-window.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 1de3f8d68b2..98163335e40 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -172,3 +172,6 @@
   [XHTML img usemap="http://example.org/#garbage-before-hash-id"]
     expected: FAIL
 
+  [HTML (standards) IMG usemap="no-hash-name"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-embed-element/embed-network-error.sub.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-embed-element/embed-network-error.sub.html.ini
new file mode 100644
index 00000000000..f060f90f0bb
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-embed-element/embed-network-error.sub.html.ini
@@ -0,0 +1,14 @@
+[embed-network-error.sub.html]
+  expected: TIMEOUT
+  [new embed: nonexistent host]
+    expected: TIMEOUT
+
+  [navigating an existing embed: nonexistent host]
+    expected: TIMEOUT
+
+  [navigating an existing embed: X-Frame-Options prevents embedding]
+    expected: TIMEOUT
+
+  [new embed: X-Frame-Options prevents embedding]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.html.ini
new file mode 100644
index 00000000000..1fc910c1016
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.html.ini
@@ -0,0 +1,4 @@
+[iframe-loading-lazy-base-url-2.html]
+  [When a loading=lazy iframe is loaded, it loads relative to the document's base URL computed at parse-time.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.html.ini
new file mode 100644
index 00000000000..1551aadc185
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.html.ini
@@ -0,0 +1,4 @@
+[iframe-loading-lazy-base-url.html]
+  [When a loading=lazy iframe is loaded, it loads relative to the document's base URL computed at parse-time.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.html.ini
new file mode 100644
index 00000000000..38cbe9fb4ad
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.html.ini
@@ -0,0 +1,7 @@
+[iframe-loading-lazy-load-event.html]
+  [In-viewport loading=lazy visibility:hidden iframe does not block the load event]
+    expected: FAIL
+
+  [In-viewport loading=lazy iframe does not block the load event]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.html.ini
new file mode 100644
index 00000000000..27a6fdcabe6
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.html.ini
@@ -0,0 +1,4 @@
+[iframe-loading-lazy-multiple-times.html]
+  [Iframes with loading='lazy' can be lazy loaded multiple times]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.html.ini
new file mode 100644
index 00000000000..37656d7bb4d
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.html.ini
@@ -0,0 +1,4 @@
+[iframe-loading-lazy-to-eager.html]
+  [Below-viewport iframes with loading='lazy' load when set to loading='eager' or the `loading` attribute is removed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.html.ini
new file mode 100644
index 00000000000..cb08121bd97
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.html.ini
@@ -0,0 +1,7 @@
+[iframe-loading-lazy.html]
+  [Below-viewport srcdoc iframes load lazily]
+    expected: FAIL
+
+  [Below-viewport iframes load lazily]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.tentative.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.tentative.html.ini
deleted file mode 100644
index 454adbb6c05..00000000000
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.tentative.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[iframe-loading-lazy.tentative.html]
-  [Test that iframes with loading='lazy' load once they enter the viewport.]
-    expected: FAIL
-
-  [Below-viewport srcdoc iframes load lazily]
-    expected: FAIL
-
-  [Below-viewport iframes load lazily]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-network-error.sub.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-network-error.sub.html.ini
new file mode 100644
index 00000000000..6d62deddc8d
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe-network-error.sub.html.ini
@@ -0,0 +1,7 @@
+[iframe-network-error.sub.html]
+  [navigating an existing iframe: nonexistent host]
+    expected: FAIL
+
+  [navigating an existing iframe: X-Frame-Options prevents embedding]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 2a166bb97b7..fc37df7e3fa 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_escaping-1.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index c6f45be1eb2..e63fe7c263e 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 963d4cd20ef..9df1ac56f2a 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index d43f38b40cd..3a32693ffa8 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,6 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
deleted file mode 100644
index bcd2fd0eab8..00000000000
--- a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[077.html]
-  [ adding several types of scripts through the DOM and removing some of them confuses scheduler ]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
new file mode 100644
index 00000000000..fca4d908c89
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-static-import-delayed.html]
+  [document.write in an imported module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 01f7b72cbe7..edae5e5adcd 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -5,5 +5,5 @@
     expected: TIMEOUT
 
   [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
index 5bc8e9f3157..297595743a6 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
@@ -1,10 +1,9 @@
 [promise-job-entry-different-function-realm.html]
-  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Thenable resolution]
     expected: FAIL
@@ -13,5 +12,5 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
index 332f5a53781..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,5 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
deleted file mode 100644
index 188bf1b21e7..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 3f6652ad075..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d23ca4f2afc..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index 3f7612e483c..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index abb65a70190..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/4K/gen/top.meta/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/a-tag.http.html.ini
deleted file mode 100644
index eeb9e696900..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/a-tag.http.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[a-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/iframe-tag.http.html.ini
deleted file mode 100644
index 17cf7b6cca8..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/img-tag.http.html.ini
deleted file mode 100644
index 64bfd8254ac..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/script-tag.http.html.ini
deleted file mode 100644
index be04a32349c..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/xhr.http.html.ini
deleted file mode 100644
index 283fc71627c..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/no-referrer/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/a-tag.http.html.ini
index ce024eb8554..c88895a9bf6 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/fetch.http.html.ini
index 406a21789a3..68c7e9a360c 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/fetch.http.html.ini
@@ -29,9 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 17f41a4f66c..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index a2493595009..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index 00fb4fb96db..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/a-tag.http.html.ini
index e822c666760..d5c3985a6b9 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/iframe-tag.http.html.ini
deleted file mode 100644
index 09fd9d01e1a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/script-tag.http.html.ini
deleted file mode 100644
index 4ffb4355b3f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/xhr.http.html.ini
deleted file mode 100644
index c0c4d2fb7cf..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/a-tag.http.html.ini
index 91acb56c4cb..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/a-tag.http.html.ini
@@ -1,11 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/fetch.http.html.ini
index 069ee59996c..cfc7c7d7944 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/fetch.http.html.ini
@@ -23,9 +23,3 @@
   [Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 8ccc993ecf9..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/img-tag.http.html.ini
deleted file mode 100644
index 9a8364a563d..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 9fc3de3fd81..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/xhr.http.html.ini
deleted file mode 100644
index b948e6e7368..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
index a861668b3cd..bc7684cf9e5 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
index 406a21789a3..68c7e9a360c 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
@@ -29,9 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 17f41a4f66c..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index a2493595009..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index 00fb4fb96db..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/a-tag.http.html.ini
index 7f2bbec3d55..c3ae9ab455e 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 09fd9d01e1a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/script-tag.http.html.ini
deleted file mode 100644
index 4ffb4355b3f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/xhr.http.html.ini
deleted file mode 100644
index c0c4d2fb7cf..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/strict-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/a-tag.http.html.ini
deleted file mode 100644
index eeb9e696900..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/a-tag.http.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[a-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/iframe-tag.http.html.ini
deleted file mode 100644
index 17cf7b6cca8..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/img-tag.http.html.ini
deleted file mode 100644
index 64bfd8254ac..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/script-tag.http.html.ini
deleted file mode 100644
index be04a32349c..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/xhr.http.html.ini
deleted file mode 100644
index 283fc71627c..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/no-referrer/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/a-tag.http.html.ini
index a861668b3cd..bc7684cf9e5 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/fetch.http.html.ini
index 406a21789a3..68c7e9a360c 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/fetch.http.html.ini
@@ -29,9 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 17f41a4f66c..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index a2493595009..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index 00fb4fb96db..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/a-tag.http.html.ini
index e822c666760..d5c3985a6b9 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/iframe-tag.http.html.ini
deleted file mode 100644
index 09fd9d01e1a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/script-tag.http.html.ini
deleted file mode 100644
index 4ffb4355b3f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/xhr.http.html.ini
deleted file mode 100644
index c0c4d2fb7cf..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/a-tag.http.html.ini
index 91acb56c4cb..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/a-tag.http.html.ini
@@ -1,11 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/fetch.http.html.ini
index 069ee59996c..cfc7c7d7944 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/fetch.http.html.ini
@@ -23,9 +23,3 @@
   [Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 8ccc993ecf9..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/img-tag.http.html.ini
deleted file mode 100644
index 9a8364a563d..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 9fc3de3fd81..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/xhr.http.html.ini
deleted file mode 100644
index b948e6e7368..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
index ce024eb8554..c88895a9bf6 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/fetch.http.html.ini
index 9f8bbfeb187..30c7a13dd26 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/fetch.http.html.ini
@@ -29,9 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 17f41a4f66c..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index a2493595009..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index 00fb4fb96db..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/a-tag.http.html.ini
index 7f2bbec3d55..c3ae9ab455e 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 09fd9d01e1a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/script-tag.http.html.ini
deleted file mode 100644
index 4ffb4355b3f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/xhr.http.html.ini
deleted file mode 100644
index c0c4d2fb7cf..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/strict-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/iframe.meta/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag.http.html.ini
index 4120d14f878..309f999fbdb 100644
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag.http.html.ini
@@ -1,38 +1,37 @@
 [iframe-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/a-tag.http.html.ini
deleted file mode 100644
index eeb9e696900..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/a-tag.http.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[a-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html.ini
index ae1d81fa43b..d765d5496ca 100644
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html.ini
@@ -1,38 +1,37 @@
 [iframe-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/img-tag.http.html.ini
deleted file mode 100644
index 64bfd8254ac..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag.http.html.ini
index a861668b3cd..bc7684cf9e5 100644
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html.ini
index 17f41a4f66c..8df0cb96ad8 100644
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html.ini
@@ -1,38 +1,37 @@
 [iframe-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/a-tag.http.html.ini
index 7f2bbec3d55..c3ae9ab455e 100644
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag.http.html.ini
index 9e6977af012..a15a87d2e9f 100644
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag.http.html.ini
@@ -1,38 +1,37 @@
 [iframe-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/a-tag.http.html.ini
index 91acb56c4cb..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/a-tag.http.html.ini
@@ -1,11 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html.ini
index 8198fef5a7f..425cfe1a6d7 100644
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html.ini
@@ -1,32 +1,7 @@
 [iframe-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/img-tag.http.html.ini
deleted file mode 100644
index 9a8364a563d..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/script-tag.http.html.ini
index 07a80e90ce4..c4bbadf2463 100644
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/script-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/script-tag.http.html.ini
@@ -5,27 +5,3 @@
   [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag.http.html.ini
index a861668b3cd..bc7684cf9e5 100644
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html.ini
index 17f41a4f66c..8df0cb96ad8 100644
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html.ini
@@ -1,38 +1,37 @@
 [iframe-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/a-tag.http.html.ini
index 7f2bbec3d55..c3ae9ab455e 100644
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html.ini
index 9e6977af012..a15a87d2e9f 100644
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html.ini
@@ -1,38 +1,37 @@
 [iframe-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/iframe-tag.http.html.ini
index 6a8067dcea7..fa52955da96 100644
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/iframe-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/iframe-tag.http.html.ini
@@ -1,38 +1,37 @@
 [iframe-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.rel-noref/no-referrer/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.rel-noref/no-referrer/a-tag.http.html.ini
deleted file mode 100644
index eeb9e696900..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/req.rel-noref/no-referrer/a-tag.http.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[a-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html.ini
deleted file mode 100644
index eeb9e696900..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[a-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html.ini
deleted file mode 100644
index 17cf7b6cca8..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html.ini
deleted file mode 100644
index 64bfd8254ac..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html.ini
deleted file mode 100644
index be04a32349c..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html.ini
deleted file mode 100644
index 283fc71627c..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
index ce024eb8554..c88895a9bf6 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
index 406a21789a3..68c7e9a360c 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.ini
@@ -29,9 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 17f41a4f66c..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index a2493595009..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index 00fb4fb96db..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/a-tag.http.html.ini
index e822c666760..d5c3985a6b9 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html.ini
deleted file mode 100644
index 09fd9d01e1a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/script-tag.http.html.ini
deleted file mode 100644
index 4ffb4355b3f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/xhr.http.html.ini
deleted file mode 100644
index c0c4d2fb7cf..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html.ini
index 91acb56c4cb..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html.ini
@@ -1,11 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html.ini
index 069ee59996c..cfc7c7d7944 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html.ini
@@ -23,9 +23,3 @@
   [Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 8ccc993ecf9..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html.ini
deleted file mode 100644
index 9a8364a563d..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 9fc3de3fd81..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html.ini
deleted file mode 100644
index b948e6e7368..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
index 89ce32e0fb3..3469a95c2c4 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
index 9f8bbfeb187..30c7a13dd26 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
@@ -29,9 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 17f41a4f66c..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index a2493595009..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index 00fb4fb96db..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html.ini
index e822c666760..d5c3985a6b9 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 09fd9d01e1a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html.ini
deleted file mode 100644
index 4ffb4355b3f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html.ini
deleted file mode 100644
index c0c4d2fb7cf..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/a-tag.http.html.ini
deleted file mode 100644
index eeb9e696900..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/a-tag.http.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[a-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/iframe-tag.http.html.ini
deleted file mode 100644
index 17cf7b6cca8..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/img-tag.http.html.ini
deleted file mode 100644
index 64bfd8254ac..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/script-tag.http.html.ini
deleted file mode 100644
index be04a32349c..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/xhr.http.html.ini
deleted file mode 100644
index 283fc71627c..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
index e209c5b1c05..724084b8d34 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
index 406a21789a3..68c7e9a360c 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch.http.html.ini
@@ -29,9 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 17f41a4f66c..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index a2493595009..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index 00fb4fb96db..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/a-tag.http.html.ini
index e822c666760..d5c3985a6b9 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/iframe-tag.http.html.ini
deleted file mode 100644
index 09fd9d01e1a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/script-tag.http.html.ini
deleted file mode 100644
index 4ffb4355b3f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/xhr.http.html.ini
deleted file mode 100644
index c0c4d2fb7cf..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/a-tag.http.html.ini
index 91acb56c4cb..99c7b7566f8 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/a-tag.http.html.ini
@@ -1,11 +1,4 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/fetch.http.html.ini
index 069ee59996c..cfc7c7d7944 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/fetch.http.html.ini
@@ -23,9 +23,3 @@
   [Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 8ccc993ecf9..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/img-tag.http.html.ini
deleted file mode 100644
index 9a8364a563d..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/script-tag.http.html.ini
deleted file mode 100644
index 9fc3de3fd81..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/xhr.http.html.ini
deleted file mode 100644
index b948e6e7368..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
index e209c5b1c05..724084b8d34 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
index 9f8bbfeb187..30c7a13dd26 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html.ini
@@ -29,9 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 17f41a4f66c..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
deleted file mode 100644
index d820d333941..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
deleted file mode 100644
index a2493595009..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
deleted file mode 100644
index 00fb4fb96db..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/a-tag.http.html.ini
index e822c666760..d5c3985a6b9 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 09fd9d01e1a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/img-tag.http.html.ini
deleted file mode 100644
index 6b8abb44e0b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/script-tag.http.html.ini
deleted file mode 100644
index 4ffb4355b3f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/xhr.http.html.ini
deleted file mode 100644
index c0c4d2fb7cf..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/a-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/a-tag.http.html.ini
index bf3a8c2fd4b..43df1b43b56 100644
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/a-tag.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/a-tag.http.html.ini
@@ -1,14 +1,13 @@
 [a-tag.http.html]
-  expected: TIMEOUT
   [Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag.http.html.ini
deleted file mode 100644
index b26f466bc2a..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[iframe-tag.http.html]
-  expected: TIMEOUT
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: NOTRUN
-
-  [Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/img-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/img-tag.http.html.ini
deleted file mode 100644
index aa63ab5301f..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/img-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[img-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag.http.html.ini
deleted file mode 100644
index c95e499dc9b..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[script-tag.http.html]
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch.http.html.ini
index 406a21789a3..68c7e9a360c 100644
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch.http.html.ini
@@ -29,9 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr.http.html.ini
index a74f71f4563..b30686cae0c 100644
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr.http.html.ini
@@ -29,9 +29,3 @@
   [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch.http.html.ini
index 069ee59996c..cfc7c7d7944 100644
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch.http.html.ini
@@ -23,9 +23,3 @@
   [Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr.http.html.ini
index 3a0d9952afc..08ff988b50a 100644
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr.http.html.ini
@@ -23,9 +23,3 @@
   [Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
index 9f8bbfeb187..30c7a13dd26 100644
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch.http.html.ini
@@ -29,9 +29,3 @@
   [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
index a74f71f4563..b30686cae0c 100644
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr.http.html.ini
@@ -29,9 +29,3 @@
   [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html.ini
deleted file mode 100644
index 9d308fc6524..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic.http.html.ini
deleted file mode 100644
index 14b56072272..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-classic.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unset/worker-module.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unset/worker-module.http.html.ini
deleted file mode 100644
index 4616dd4ab53..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unset/worker-module.http.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[worker-module.http.html]
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html.ini
deleted file mode 100644
index b9994300f08..00000000000
--- a/tests/wpt/metadata/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/webdriver/tests/switch_to_frame/switch.py.ini b/tests/wpt/metadata/webdriver/tests/switch_to_frame/switch.py.ini
index 839bee104d5..b52f7189449 100644
--- a/tests/wpt/metadata/webdriver/tests/switch_to_frame/switch.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/switch_to_frame/switch.py.ini
@@ -17,3 +17,6 @@
   [test_no_browsing_context]
     expected: ERROR
 
+  [test_frame_deleted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webdriver/tests/switch_to_frame/switch_number.py.ini b/tests/wpt/metadata/webdriver/tests/switch_to_frame/switch_number.py.ini
new file mode 100644
index 00000000000..67a9320f98c
--- /dev/null
+++ b/tests/wpt/metadata/webdriver/tests/switch_to_frame/switch_number.py.ini
@@ -0,0 +1,16 @@
+[switch_number.py]
+  [test_frame_id_number_index[1-bar\]]
+    expected: FAIL
+
+  [test_frame_id_number_index_nested]
+    expected: FAIL
+
+  [test_frame_id_number_index_out_of_bounds[65535\]]
+    expected: FAIL
+
+  [test_frame_id_number_index[0-foo\]]
+    expected: FAIL
+
+  [test_frame_id_number_index_out_of_bounds[1\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webdriver/tests/switch_to_frame/switch_webelement.py.ini b/tests/wpt/metadata/webdriver/tests/switch_to_frame/switch_webelement.py.ini
new file mode 100644
index 00000000000..5ed6b633e40
--- /dev/null
+++ b/tests/wpt/metadata/webdriver/tests/switch_to_frame/switch_webelement.py.ini
@@ -0,0 +1,7 @@
+[switch_webelement.py]
+  [test_frame_id_webelement_frame[1-bar\]]
+    expected: FAIL
+
+  [test_frame_id_webelement_frame[0-foo\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/subresource.py b/tests/wpt/web-platform-tests/common/security-features/subresource/subresource.py
index a003a3342fb..0416c324b31 100644
--- a/tests/wpt/web-platform-tests/common/security-features/subresource/subresource.py
+++ b/tests/wpt/web-platform-tests/common/security-features/subresource/subresource.py
@@ -121,7 +121,8 @@ def preprocess_stash_action(request, response):
 
     key = request.GET[b"key"]
     stash = request.server.stash
-    path = request.GET.get(b"path", isomorphic_encode(request.url.split(u'?')[0]))
+    path = request.GET[b"path"] if b"path" in request.GET \
+           else isomorphic_encode(request.url.split(u'?')[0])
 
     if action == b"put":
         value = isomorphic_decode(request.GET[b"value"])
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-clipping-002.html b/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-clipping-002.html
new file mode 100644
index 00000000000..eea0ee104fc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-clipping-002.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Backgrounds and Borders Test: 'border-radius' and corner-clipping of content elements</title>
+
+  <link rel="author" title="zhouli" href="mailto:liz@oupeng.com">
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="http://www.w3.org/TR/css3-background/#corner-clipping">
+  <link rel="match" href="../reference/ref-nothing-below.xht">
+
+  <meta content="" name="flag">
+  <meta name="assert" content="When set with 'overflow: hidden', an outer container must clip text of its child element at its corners. In this test, the outer container, which has immense size, has a 'border-radius' declaration which implies that the clipping must occur at its curve.">
+
+  <style>
+  body
+    {
+      overflow: hidden;
+      /*
+      otherwise, horizontal and vertical
+      scroll bars will be generated
+      */
+    }
+
+  div#fail-condition
+    {
+      border-radius: 250em;
+      color: red;
+      font-size: 32px;
+      height: 500em;
+      overflow: hidden;
+      width: 500em;
+    }
+  </style>
+
+  <p>Test passes if there is nothing below.
+
+  <div id="fail-condition">FAIL FAIL FAIL FAIL</div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-clipping.html b/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-clipping.html
index 62da6394c40..331bc61f203 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-clipping.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-clipping.html
@@ -1,40 +1,37 @@
 <!DOCTYPE html>
-<html>
-<head>
-    <title>Border radius clipping</title>
-    <link rel="author" title="zhouli" href="mailto:liz@oupeng.com">
-    <link rel="help" href="http://www.w3.org/TR/css3-background/#corner-clipping" />
-    <link rel="match" href="reference/border-radius-clipping-ref.html">
-    <meta name="assert" content="When set with 'overflow: hidden', outer container should clip background of an element insides at the corners. " />
-    <style>
-        #parent{
-            border-radius: 15px;
-            border: 1px solid blue;
-            overflow: hidden;
-            width: 300px;
-            height: 30px;
-        }
-        #son{
-            background-color: green;
-            width: 300px;
-            height: 30px;
-        }
-        #dummy {
-            border-radius: 5000em;
-            height: 10000em;
-            overflow: hidden;
-            width: 10000em;
-        }
-    </style>
-</head>
-<body>
-<div id="parent">
+
+  <meta charset="UTF-8">
+
+  <title>CSS Backgrounds and Borders Test: 'border-radius' and corner-clipping of content elements</title>
+
+  <link rel="author" title="zhouli" href="mailto:liz@oupeng.com">
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="http://www.w3.org/TR/css3-background/#corner-clipping">
+  <link rel="match" href="reference/border-radius-clipping-ref.html">
+
+  <meta content="" name="flag">
+  <meta name="assert" content="When set with 'overflow: hidden', an outer container must clip background area of its child element at its corners. In this test, the outer container has a 'border-radius' declaration which implies that the clipping must occur at its curves.">
+
+  <style>
+  div#parent
+    {
+      border: transparent solid 20px;
+      border-radius: 50%;
+      overflow: hidden;
+      width: 100px;
+    }
+
+  div#son
+    {
+      background-color: red;
+      background-image: url("support/100x100-green-with-red-corners.png");
+      height: 100px;
+      width: 100px;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green circle and <strong>no red</strong>.
+
+  <div id="parent">
     <div id="son"></div>
-</div>
-<div id="dummy">
-    This should not appear if browser supports border-radius
-</div>
-<script>
-</script>
-</body>
-</html>
\ No newline at end of file
+  </div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-radius-clipping-ref.html b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-radius-clipping-ref.html
index e524aff19d0..344cd01c7a1 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-radius-clipping-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-radius-clipping-ref.html
@@ -1,28 +1,24 @@
 <!DOCTYPE html>
-<html>
-<head>
-    <title>Border radius clipping</title>
-    <link rel="author" title="zhouli" href="mailto:liz@oupeng.com">
-    <style>
-        #parent{
-        	border-radius: 15px;
-        	border: 1px solid blue;
-        	overflow: hidden;
-        	width: 300px;
-            height: 30px;
-            background-color: green;
-        }
-        #son{
-        	width: 300px;
-            height: 30px;
-        }
-    </style>
-</head>
-<body>
-<div id="parent">
-    <div id="son"></div>
-</div>
-<script>
-</script>
-</body>
-</html>
\ No newline at end of file
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      background-color: green;
+      border-radius: 50%;
+      height: 100px;
+      left: 20px;
+      position: relative;
+      top: 20px;
+      width: 100px;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green circle and <strong>no red</strong>.
+
+  <div></div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/100x100-green-with-red-corners.png b/tests/wpt/web-platform-tests/css/css-backgrounds/support/100x100-green-with-red-corners.png
new file mode 100644
index 0000000000000000000000000000000000000000..a193937c0d017b4b497a68874468fa92123f223e
GIT binary patch
literal 1517
zcmZvcc|6k%9LImN?U`e=M~>X1<d`u>?$oemJ@GKIF+|U1^AN)rm0~$p8HJ}yNRD`N
z#p7x*^5mEt2`S2vq$jV;^CVZEslT4r>-ppR{vNN-_xS6Z;qHc)l~$Do06>=D;!G5K
z>W)cDh`F680R{j_>1i)Aix|X4GNU4bL&9iCRy>o2q{W2<13=uwM-t@<N)Nt8SM-sP
zmlQ<BdDCD%=Q0_8Eekd5%zL&7&si_aDd^<8dl5}*V+DO%Nf({Ejk)t)L{Zbpj1-h+
zU0YQPMHJb%adi1?@#<Ojc6%UnkjbBCec63B)n4n|q0@$6M1|$Tl_LJOJ5T2+J+ZS*
zR$)Q4U8}1~6PGm5{iMU2htmB}EVI>Jy^@dyI!||n_Y&kooYh`bmU7++9SmnIg@cxE
zcpGp+9NWqx)zuyh<yqcLnO-MtDx#rDa9{iA?$+mh#KNwpvnjpks_JS|UhB>GFcCXz
zs$fBC8x+zAKD~i(K;|s{?di~?_WGb>OXQhjk62o38g05V-JLN`{a-^bKOBAdu+miU
zmUXM8xvl^?X5`yS5|x^Pn!^Ntw7z+IO<p73B8w`^E^~zMQO2oyg$%u__e{&k)<fw>
zzdJmcbRBeLS`+??VTB%b?*O{hZHKiJ``8r5F3M+SzS$3&IU03og_j239-3T2IflMS
z))B2~qQ<){p9Q99<LB(L@bp1jY_7(ems`tbeqcn7#ylKW8Bq%QWL4BSC#|*sU_t!-
znD^Gw2puvKlPZDuBxRl|A5V)tntV7I@Cvd`>z1v_lH9eY$21wj#K>SQ*Y!_%C_Ne{
zOM;S<=P=slhzbC81pAdC>@G6I-bvr*(L=mjniZB>a<|8Oqyk&a-G98_x4uO^N_fR{
z^j36F15=6|SrX`w=Xdm;;stL;)q=mad+4l^Z`d&LSso>%;lYQZC&mY3J~sar0OMgW
zJiMx{NWa+ahD(V`nb0C;-Y3}Kr9si#uWooamlRn!<zZLzHR?S0fNlBmkzU9@nW{|{
zR*KZVj6K1JFYN^}4?y&-gFA(EZnmsVr%>6;&?p^4gx|uZ?m=9-N>-YzJ>%r&=h6nV
zf+4@Kk?-IwCdgG(ctMfnqA@FIFZJ0VXAvB%r7+jqTt)04CUZY3MuE*CKW7olA472#
zIOP@#Xa>_&e`bs{L}@hfSS120=Ig34&UY`!j;+l6PM%KXKTjVF=n$aM0}2T<?a>>P
ztLkxXJE$qB$tug?3Hs0~+N=-mc@2HNi8j+4g(vfY*Y0Gk(O2R3Rn#hmAA60b@5gD%
zjb)=Wq<rPM(#yy4@cN6j+82XdW<53)r50m6Yx@WAi?<Wv2*<BPj8NB*<E>O`eW<R%
z0jkO3cowHVAFXShf++M1n9w}<VBh3zmCLJ`HInHB7EN2;<mNA(u>M@UfFI)B(ZX$;
z;8f^1qZ&m$^{}k)P(908Xe+5c3`MuHsWh(j4`q_l>dayzdw5+XR~f6|1}I*|F#+v;
z%6Zmt@A$}whp2TzMDc&w)g|+p)ychhr-^Z|w;av6FMq>_9%10n6yET*-^6<EPXqM4
ziu0A+JiVbJ|M-d%zueXdEi)!dJYrXR_JO&@N(x_XV)<Iu1OBOLn3C5m{KBOIh+G3X
zaI6(_bBYgc&p^<7`O7zB2U!KzHnOMs&(ruDnQPVMVib^hW{0>NYT+pckO$<jDe>ci
z(6O#q0I223Yz9HaxfIjICmI0c9`6_^7bT}AF2Yy@R~&2(wrjUKl3{n^sko%V!jV}{
z5vNYk!dZY*6fKBFqaxWMECv!!aCIjo$tjCPB?M=zm-z2Z*8T_}B_V<*z3=@fNYf#{
z+<4NpiR<3^dM{_2y%oqcfdUTnr*D+WD?P5t>E}RYl#IyVSp(ULYXYUdQ6Rq)3pl#}
z?b?|jmVM{{HYNnDWzN`f&69U@knhWsB*-M&^<QDmi0S*A;)4MK&ds^XF_7~w^7)*q

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-23.xml b/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-23.xml
deleted file mode 100644
index 663ec09ef2c..00000000000
--- a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-23.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>:enabled pseudo-class</title>
-  <style type="text/css"><![CDATA[button { background-color : red }
-input { background-color : red }
-button:enabled { background-color : lime }
-input:enabled { background-color : lime }]]></style>
-  <link rel="author" title="Daniel Glazman" href="http://glazman.org/"/>
-  <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
-  <link rel="help" href="https://www.w3.org/TR/css3-selectors/#selectors"/> <!-- bogus link to make sure it gets found -->
-  <meta name="flags" content="" />
- </head>
- <body>
-<p>
- <button>A button (enabled) with green background</button>
- <br></br>
- <input type="text" size="36" value="a text area (enabled) with green background"></input>
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-24.xml b/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-24.xml
deleted file mode 100644
index d20a0116f74..00000000000
--- a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-24.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>:disabled pseudo-class</title>
-  <style type="text/css"><![CDATA[button { background-color : red }
-input { background-color : red }
-button:disabled { background-color : lime }
-input:disabled { background-color : lime }]]></style>
-  <link rel="author" title="Daniel Glazman" href="http://glazman.org/"/>
-  <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
-  <link rel="help" href="https://www.w3.org/TR/css3-selectors/#selectors"/> <!-- bogus link to make sure it gets found -->
-  <meta name="flags" content="" />
- </head>
- <body>
-<p>
- <button disabled="disabled">A button (disabled) with green background</button>
- <br></br>
- <input disabled="disabled" type="text" size="36" value="a text area (disabled) with green background"></input>
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-68.xml b/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-68.xml
deleted file mode 100644
index 99c28261381..00000000000
--- a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-68.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>NEGATED :enabled pseudo-class</title>
-  <style type="text/css"><![CDATA[button { background-color : red }
-input { background-color : red }
-button:not(:enabled) { background-color : lime }
-input:not(:enabled)  { background-color : lime }]]></style>
-  <link rel="author" title="Daniel Glazman" href="http://glazman.org/"/>
-  <link rel="help" href="https://www.w3.org/TR/css3-selectors/#selectors"/> <!-- bogus link to make sure it gets found -->
-  <meta name="flags" content="" />
- </head>
- <body>
-<p>
- <button disabled="disabled">A button (disabled) with green background</button>
- <br></br>
- <input disabled="disabled" type="text" size="36" value="a text area (disabled) with green background"></input>
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-69.xml b/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-69.xml
deleted file mode 100644
index 3da2a7f43c5..00000000000
--- a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-69.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>NEGATED :disabled pseudo-class</title>
-  <style type="text/css"><![CDATA[button { background-color : red }
-input { background-color : red }
-button:not(:disabled) { background-color : lime }
-input:not(:disabled) { background-color : lime }]]></style>
-  <link rel="author" title="Daniel Glazman" href="http://glazman.org/"/>
-  <link rel="help" href="https://www.w3.org/TR/css3-selectors/#selectors"/> <!-- bogus link to make sure it gets found -->
-  <meta name="flags" content="" />
- </head>
- <body>
-<p>
- <button>A button (enabled) with green background</button>
- <br></br>
- <input type="text" size="36" value="a text area (enabled) with green background"></input>
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/selectors/pseudo-enabled-disabled.html b/tests/wpt/web-platform-tests/css/selectors/pseudo-enabled-disabled.html
new file mode 100644
index 00000000000..521767de376
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/selectors/pseudo-enabled-disabled.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/selectors-4/#enableddisabled">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<div id="container">
+<button id="button_enabled"></button>
+<button id="button_disabled" disabled></button>
+<input id="input_enabled">
+<input id="input_disabled" disabled>
+<select id="select_enabled"></select>
+<select id="select_disabled" disabled></select>
+<textarea id="textarea_enabled"></textarea>
+<textarea id="textarea_disabled" disabled></textarea>
+<span id="incapable"></span>
+</div>
+
+<script>
+test(() => {
+  const container = document.querySelector('#container');
+  const matched = container.querySelectorAll(':enabled');
+  for (let element of matched) {
+    assert_true(element.id.endsWith('_enabled'), element.id);
+  }
+}, ':enabeld should match to enabled controls');
+
+test(() => {
+  const container = document.querySelector('#container');
+  const matched = container.querySelectorAll(':disabled');
+  for (let element of matched) {
+    assert_true(element.id.endsWith('_disabled'), element.id);
+  }
+}, ':disabled should match to enabled controls');
+
+test(() => {
+  const container = document.querySelector('#container');
+  const matched = container.querySelectorAll(':not(:enabled)');
+  for (let element of matched) {
+    assert_true(element.id.endsWith('_disabled') || element.id == 'incapable', element.id);
+  }
+}, ':not(:enabeld) should match to disabled controls and non-controls');
+
+test(() => {
+  const container = document.querySelector('#container');
+  const matched = container.querySelectorAll(':not(:disabled)');
+  for (let element of matched) {
+    assert_true(element.id.endsWith('_enabled') || element.id == 'incapable', element.id);
+  }
+}, ':not(:disabled) should match to enabled controls and non-controls');
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/historical.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/historical.html
index d98a74df4e1..d7395632eb9 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/historical.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/historical.html
@@ -36,6 +36,8 @@ t('initialTime'); // added in r5310, removed in r7046.
 t('audio', 'video'); // added in r5636, replaced with muted in r5991.
 t('startDate'); // added in r7045, replaced with getStartDate() in r8113.
 t('mozSrcObject'); // never in the spec
+t('mozPreservesPitch'); // prefixed version should be removed.
+t('webkitPreservesPitch'); // prefixed version should be removed.
 
 // TextTrackCue constructor: added in r5723, removed in r7742.
 test(function() {
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/pitch-detector.js b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/pitch-detector.js
new file mode 100644
index 00000000000..595bde3120c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/pitch-detector.js
@@ -0,0 +1,48 @@
+// This should be removed when the webaudio/historical.html tests are passing.
+// Tracking bug: https://bugs.webkit.org/show_bug.cgi?id=204719
+window.AudioContext = window.AudioContext || window.webkitAudioContext;
+
+var FFT_SIZE = 2048;
+
+function getPitchDetector(media, t) {
+  var audioContext = new AudioContext();
+  t.add_cleanup(() => audioContext.close());
+
+  var sourceNode = audioContext.createMediaElementSource(media);
+
+  var analyser = audioContext.createAnalyser();
+  analyser.fftSize = FFT_SIZE;
+
+  sourceNode.connect(analyser);
+  analyser.connect(audioContext.destination);
+
+  return () => getPitch(analyser);
+}
+
+function getPitch(analyser) {
+  // Returns the frequency value for the nth FFT bin.
+  var binConverter = (bin) =>
+    (analyser.context.sampleRate/2)*((bin)/(analyser.frequencyBinCount-1));
+
+  var buf = new Uint8Array(analyser.frequencyBinCount);
+  analyser.getByteFrequencyData(buf);
+  return findDominantFrequency(buf, binConverter);
+}
+
+// Returns the dominant frequency, +/- a certain margin.
+function findDominantFrequency(buf, binConverter) {
+  var max = 0;
+  var bin = 0;
+
+  for (var i=0;i<buf.length;i++) {
+    if(buf[i] > max) {
+      max = buf[i];
+      bin = i;
+    }
+  }
+
+  // The spread of frequencies within bins is constant and corresponds to
+  // (1/(FFT_SIZE-1))th of the sample rate. Use the value of bin #1 as a
+  // shorthand for that value.
+  return { value:binConverter(bin), margin:binConverter(1) };
+}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/preserves-pitch.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/preserves-pitch.html
new file mode 100644
index 00000000000..9a86cbc210b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/preserves-pitch.html
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<title>Test preservesPitch.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="pitch-detector.js"></script>
+<script>
+
+// Remove when media-elements/historical.html's preservePitch prefix tests are are passing.
+function getPreservesPitch(audio) {
+    if ("preservesPitch" in HTMLAudioElement.prototype) {
+        return audio.preservesPitch;
+    }
+    if ("mozPreservesPitch" in HTMLAudioElement.prototype) {
+        return audio.mozPreservesPitch;
+    }
+    if ("wekbitPreservesPitch" in HTMLAudioElement.prototype) {
+        return audio.wekbitPreservesPitch;
+    }
+    return undefined;
+}
+
+// Remove when media-elements/historical.html's preservePitch prefix tests are are passing.
+function setPreservesPitch(audio, value) {
+    if ("preservesPitch" in HTMLAudioElement.prototype) {
+        audio.preservesPitch = value;
+    } else if ("mozPreservesPitch" in HTMLAudioElement.prototype) {
+        audio.mozPreservesPitch = value;
+    } else if ("wekbitPreservesPitch" in HTMLAudioElement.prototype) {
+        audio.wekbitPreservesPitch = value;
+    }
+}
+
+test(function(t) {
+    assert_true("preservesPitch" in HTMLAudioElement.prototype);
+}, "Test that preservesPitch is present and unprefixed.");
+
+test(function(t) {
+    let audio = document.createElement('audio');
+    assert_true(getPreservesPitch(audio));
+
+    setPreservesPitch(audio, false);
+    assert_false(getPreservesPitch(audio));
+}, "Test that presevesPitch is on by default");
+
+function testPreservesPitch(preservesPitch, playbackRate, expectedPitch, description) {
+    promise_test(async t => {
+        let audio = document.createElement('audio');
+
+        var detector = getPitchDetector(audio, t);
+
+        // This file contains 5 seconds of a 440hz sine wave.
+        audio.src = "/media/sine440.mp3";
+
+        audio.playbackRate = playbackRate;
+        setPreservesPitch(audio, preservesPitch);
+
+        function waitUntil(time) {
+            return new Promise((resolve) => {
+                audio.ontimeupdate = () => {
+                    if (audio.currentTime >= time) {
+                        resolve();
+                    }
+                };
+            });
+        }
+
+        await test_driver.bless("Play audio element", () => audio.play() )
+
+        // Wait until we have at least played some audio. Otherwise, the
+        // detector might return a pitch of 0Hz.
+        await waitUntil(0.5);
+
+        var pitch = detector();
+
+        // 25Hz is larger than the margin we get from 48kHz and 44.1kHz
+        // audio being analyzed by a FFT of size 2048. If we get something
+        // different, there is an error within the test's calculations (or
+        // we might be dealing a larger sample rate).
+        assert_less_than(pitch.margin, 25,
+            "Test error: the margin should be reasonably small.")
+
+        assert_approx_equals(pitch.value, expectedPitch, pitch.margin,
+            "The actual pitch should be close to the expected pitch.");
+
+    }, description);
+}
+
+var REFERENCE_PITCH = 440;
+
+testPreservesPitch(true, 1.0, REFERENCE_PITCH,
+    "The default playbackRate should not affect pitch")
+
+testPreservesPitch(false, 1.0, REFERENCE_PITCH,
+    "The default playbackRate should not affect pitch, even with preservesPitch=false")
+
+testPreservesPitch(true, 2.0, REFERENCE_PITCH,
+    "Speed-ups should not change the pitch when preservesPitch=true")
+
+testPreservesPitch(true, 0.5, REFERENCE_PITCH,
+    "Slow-downs should not change the pitch when preservesPitch=true")
+
+testPreservesPitch(false, 2.0, REFERENCE_PITCH*2.0,
+    "Speed-ups should change the pitch when preservesPitch=false")
+
+testPreservesPitch(false, 0.5, REFERENCE_PITCH*0.5,
+    "Slow-downs should change the pitch when preservesPitch=false")
+
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/resources/not-embeddable.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/resources/not-embeddable.html
new file mode 100644
index 00000000000..a941511642a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/resources/not-embeddable.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>I should not be embeddable because of X-Frame-Options</title>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/resources/not-embeddable.html.headers b/tests/wpt/web-platform-tests/html/semantics/embedded-content/resources/not-embeddable.html.headers
new file mode 100644
index 00000000000..fa717cc748e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/resources/not-embeddable.html.headers
@@ -0,0 +1 @@
+X-Frame-Options: deny
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-network-error.sub.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-network-error.sub.html
new file mode 100644
index 00000000000..bae995c101f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-network-error.sub.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Network errors with embed elements</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<body>
+<script>
+"use strict";
+
+async_test(t => {
+  const embed = document.createElement("embed");
+  embed.src = "//{{hosts[][nonexistent]}}/";
+  embed.onload = () => t.done();
+  embed.onerror = t.unreached_func("error event must not fire");
+  document.body.append(embed);
+}, "new embed: nonexistent host");
+
+async_test(t => {
+  const embed = document.createElement("embed");
+  embed.src = "../resources/not-embeddable.html";
+  embed.onload = () => t.done();
+  embed.onerror = t.unreached_func("error event must not fire");
+  document.body.append(embed);
+}, "new embed: X-Frame-Options prevents embedding");
+
+async_test(t => {
+  const embed = document.createElement("embed");
+  embed.src = "/common/blank.html";
+  embed.name = "existingEmbed1";
+  embed.onload = t.step_func(() => {
+    embed.onload = () => t.done();
+    embed.onerror = t.unreached_func("error event must not fire 2");
+
+    frames.existingEmbed1.location.href = "//{{hosts[][nonexistent]}}/";
+  });
+  embed.onerror = t.unreached_func("error event must not fire 1");
+  document.body.append(embed);
+}, "navigating an existing embed: nonexistent host");
+
+async_test(t => {
+  const embed = document.createElement("embed");
+  embed.src = "/common/blank.html";
+  embed.name = "existingEmbed2";
+  embed.onload = t.step_func(() => {
+    embed.onload = () => t.done();
+    embed.onerror = t.unreached_func("error event must not fire 2");
+
+    frames.existingEmbed2.location.href = "../resources/not-embeddable.html";
+  });
+  embed.onerror = t.unreached_func("error event must not fire 1");
+  document.body.append(embed);
+}, "navigating an existing embed: X-Frame-Options prevents embedding");
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-eager.tentative.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-eager.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-eager.tentative.html
rename to tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-eager.html
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.tentative.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.tentative.html
rename to tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.html
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.tentative.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.tentative.html
rename to tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.html
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.tentative.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.tentative.html
rename to tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.html
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.tentative.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.tentative.html
rename to tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.html
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-referrerpolicy-change.sub.tentative.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-referrerpolicy-change.sub.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-referrerpolicy-change.sub.tentative.html
rename to tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-referrerpolicy-change.sub.html
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.tentative.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.tentative.html
rename to tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.html
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.tentative.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.tentative.html
rename to tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.html
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-network-error.sub.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-network-error.sub.html
new file mode 100644
index 00000000000..4dd3012af46
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-network-error.sub.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Network errors with iframe elements</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<body>
+<script>
+"use strict";
+
+async_test(t => {
+  const iframe = document.createElement("iframe");
+  iframe.src = "//{{hosts[][nonexistent]}}/";
+  iframe.onload = () => t.done();
+  iframe.onerror = t.unreached_func("error event must not fire");
+  document.body.append(iframe);
+}, "new iframe: nonexistent host");
+
+async_test(t => {
+  const iframe = document.createElement("iframe");
+  iframe.src = "../resources/not-embeddable.html";
+  iframe.onload = () => t.done();
+  iframe.onerror = t.unreached_func("error event must not fire");
+  document.body.append(iframe);
+}, "new iframe: X-Frame-Options prevents embedding");
+
+async_test(t => {
+  const iframe = document.createElement("iframe");
+  iframe.src = "/common/blank.html";
+  iframe.name = "existingIframe1";
+  iframe.onload = t.step_func(() => {
+    iframe.onload = () => t.done();
+    iframe.onerror = t.unreached_func("error event must not fire 2");
+
+    frames.existingIframe1.location.href = "//{{hosts[][nonexistent]}}/";
+  });
+  iframe.onerror = t.unreached_func("error event must not fire 1");
+  document.body.append(iframe);
+}, "navigating an existing iframe: nonexistent host");
+
+async_test(t => {
+  const iframe = document.createElement("iframe");
+  iframe.src = "/common/blank.html";
+  iframe.name = "existingIframe2";
+  iframe.onload = t.step_func(() => {
+    iframe.onload = () => t.done();
+    iframe.onerror = t.unreached_func("error event must not fire 2");
+
+    frames.existingIframe2.location.href = "../resources/not-embeddable.html";
+  });
+  iframe.onerror = t.unreached_func("error event must not fire 1");
+  document.body.append(iframe);
+}, "navigating an existing iframe: X-Frame-Options prevents embedding");
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission.html b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission.html
index 3ed9dad9234..bc3706c4521 100644
--- a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission.html
+++ b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission.html
@@ -9,7 +9,7 @@
 
 <body>
 <dialog id="favDialog">
-  <form method="dialog">
+  <form id="dialogForm" method="dialog">
     <button id="confirmBtn" value="default">Confirm</button>
     <input id="confirmImgBtn" src="./resources/submit.jpg" width="41"
     height="41" type="image" alt="Hello">
@@ -78,5 +78,25 @@ promise_test(async () => {
   assert_false(dialog.open, "dialog should be closed now");
 }, "formmethod attribute should use dialog form submission");
 
+promise_test(async () => {
+  const dialog = document.querySelector('dialog');
+  dialog.returnValue = "";
+  dialog.showModal();
+
+  const button = document.querySelector('button');
+  button.value = "sushi";
+
+  const dialogForm = document.getElementById('dialogForm');
+  dialogForm.onsubmit = function() {
+    dialog.close();
+  }
+
+  button.click();
+  assert_false(dialog.open, "dialog should be closed now");
+  // If the submission request got processed, the returnValue should change
+  // to "sushi" because that's the value of the submitter
+  assert_equals(dialog.returnValue, "", "dialog's returnValue remains the same");
+}, "closing the dialog while submitting should stop the submission");
+
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/interfaces/appmanifest.idl b/tests/wpt/web-platform-tests/interfaces/appmanifest.idl
index 926a4fc2022..0d24849b9f7 100644
--- a/tests/wpt/web-platform-tests/interfaces/appmanifest.idl
+++ b/tests/wpt/web-platform-tests/interfaces/appmanifest.idl
@@ -8,11 +8,7 @@ dictionary WebAppManifest {
    DOMString lang;
    USVString name;
    USVString short_name;
-   USVString description;
    sequence<ManifestImageResource> icons;
-   sequence<ManifestImageResource> screenshots;
-   sequence<USVString> categories;
-   DOMString iarc_rating_id;
    USVString start_url;
    DisplayModeType display = "browser";
    OrientationLockType orientation;
diff --git a/tests/wpt/web-platform-tests/interfaces/input-device-capabilities.idl b/tests/wpt/web-platform-tests/interfaces/input-device-capabilities.idl
index 86015b30dbd..36fdbd21c42 100644
--- a/tests/wpt/web-platform-tests/interfaces/input-device-capabilities.idl
+++ b/tests/wpt/web-platform-tests/interfaces/input-device-capabilities.idl
@@ -3,9 +3,9 @@
 // (https://github.com/tidoust/reffy-reports)
 // Source: Input Device Capabilities (https://wicg.github.io/input-device-capabilities/)
 
-[Exposed=Window,
- Constructor(optional InputDeviceCapabilitiesInit deviceInitDict = {})]
+[Exposed=Window]
 interface InputDeviceCapabilities {
+  constructor(optional InputDeviceCapabilitiesInit deviceInitDict = {});
   readonly attribute boolean firesTouchEvents;
   readonly attribute boolean pointerMovementScrolls;
 };
diff --git a/tests/wpt/web-platform-tests/lint.ignore b/tests/wpt/web-platform-tests/lint.ignore
index 23cf8609bf2..40b7cb2c218 100644
--- a/tests/wpt/web-platform-tests/lint.ignore
+++ b/tests/wpt/web-platform-tests/lint.ignore
@@ -45,6 +45,7 @@ TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.ico
 TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.wasm
 TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.bmp
 TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.sxg
+TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.wbn
 
 ## .gitignore
 W3C-TEST.ORG: .gitignore
@@ -706,6 +707,7 @@ WEB-PLATFORM.TEST:signed-exchange/resources/generate-test-sxgs.sh
 # Web Bundle files have hard-coded URLs
 WEB-PLATFORM.TEST:web-bundle/resources/generate-test-wbns.sh
 WEB-PLATFORM.TEST:web-bundle/resources/wbn/*.wbn
+WEB-PLATFORM.TEST:web-bundle/subresource-loading/subresource-loading-from-web-bundle.tentative.html
 
 # Tests that depend on resources in /gen/ in Chromium:
 # https://github.com/web-platform-tests/wpt/issues/16455
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-002.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-002.html
index c3cbf7c435f..5eed04bb0f5 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-002.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-002.html
@@ -50,7 +50,7 @@
       for (var i = 0; i <= 2; i++) {
         var mpadded = getBox("depth" + i);
         assert_equals(mpadded.width, contentWidth, "width" + i);
-        assert_approx_equals(getBox("baseline").bottom - mpadded.top, contentHeight, epsilon, "height" + i);
+        assert_approx_equals(getBox("baseline2").bottom - mpadded.top, contentHeight, epsilon, "height" + i);
         assert_approx_equals(mpadded.bottom - getBox("baseline").bottom, 25*(i+1), epsilon, "depth" + i);
       }
     }, "Different depths");
@@ -59,7 +59,7 @@
       for (var i = 0; i <= 2; i++) {
         var mpadded = getBox("mpadded" + i);
         assert_approx_equals(mpadded.width, 25*(1+i%3), epsilon, "width" + i);
-        assert_approx_equals(getBox("baseline").bottom - mpadded.top, 25*(1+(i+1)%3), epsilon, "height" + i);
+        assert_approx_equals(getBox("baseline2").bottom - mpadded.top, 25*(1+(i+1)%3), epsilon, "height" + i);
         assert_approx_equals(mpadded.bottom - getBox("baseline").bottom, 25*(1+(i+2)%3), epsilon, "depth" + i);
       }
     }, "Various combinations of height, depth and width.");
@@ -79,7 +79,7 @@
         document.getElementById("dynamic-attach").setAttribute(name, length);
         document.getElementById("dynamic-modify").setAttribute(name, length);
     });
-    let baseline = getBox("baseline2").bottom;
+    let baseline = getBox("baseline3").bottom;
 
     test(function() {
         let remove = getBox("dynamic-remove");
@@ -126,6 +126,11 @@ div.shrink-wrap {
       <mpadded id="height0" height="25px"><mspace width="100px" depth="125px" height="150px" style="background: black; opacity: .5"/></mpadded>
       <mpadded id="height1" height="50px"><mspace width="100px" depth="125px" height="150px" style="background: black; opacity: .5"/></mpadded>
       <mpadded id="height2" height="75px"><mspace width="100px" depth="125px" height="150px" style="background: black; opacity: .5"/></mpadded>
+    </math>
+  </p>
+  <p>
+    <span id="baseline2" style="display: inline-block; width: 30px; height: 5px; background: blue"></span>
+    <math>
       <mpadded id="depth0" depth="25px"><mspace width="100px" depth="125px" height="150px" style="background: black; opacity: .5"/></mpadded>
       <mpadded id="depth1" depth="50px"><mspace width="100px" depth="125px" height="150px" style="background: black; opacity: .5"/></mpadded>
       <mpadded id="depth2" depth="75px"><mspace width="100px" depth="125px" height="150px" style="background: black; opacity: .5"/></mpadded>
@@ -140,7 +145,7 @@ div.shrink-wrap {
     </div>
   </div>
   <p>
-    <span id="baseline2" style="display: inline-block; width: 30px; height: 5px; background: blue"></span>
+    <span id="baseline3" style="display: inline-block; width: 30px; height: 5px; background: blue"></span>
     <math>
       <mpadded id="dynamic-attach" style="background: lightgreen"><mspace width="100px" depth="125px" height="150px" style="background: black; opacity: .5"/></mpadded>
       <mpadded id="dynamic-remove" width="10px" height="20px" depth="30px" style="background: lightyellow"><mspace width="100px" depth="125px" height="150px" style="background: black; opacity: .5"/></mpadded>
diff --git a/tests/wpt/web-platform-tests/media/sine440.mp3 b/tests/wpt/web-platform-tests/media/sine440.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..4ded8b338025da1b6bec8d0c25d376bcaed5a64a
GIT binary patch
literal 80666
zcmd?SdsvL?+y8&vvum1}GLtq_l4&DtrcBx>!aX%@5T=9(O-V&IQLI=N_f(U1D3Xyd
zB@9B@vsk7LqR<Z6wI)K@d}J+ISm<}%GwOMc-(SB!?&o(r-|zUt@mZgvV{pCZeV*ra
zUgxI&>yF0hw*g?6ym#>|#7Ha4j{M`>M4C0*>FA|9G_o;sYeJb}h<MT5+JrJiyys^B
z>q*SkRg{p?WJ*yg6#*!lMT$AEM1!RWu%F(?c4MH<quTvOD4l~UGdEEZKCv6xZC6GQ
z`IWN#o&R0QmMay1YyNve`SN%1`&xWDKbU`6rTP(a@oUGBcdlR6KSsE2T+sP#;)1@*
z6Sq%h`@JAtS}<|{GH*7GC&6MR^D!Pvu)yCR@aTer4vTn_Ji&VMj*;qAe$^g@lPRDC
z8&{*=H(rnJup{UBh%S{dKne9**5qNmmxmxlK8EJ@$@5q1%kzc^@9a1->OI#_{f|{9
zwa@PL<kx?psz2s?$4Scfo$NC)ij{ir3m%&NlF{G4duStTYsr{#N%gO<_EANC)uEiG
z_)1C@ATJ1SK{+6@2>{@lAV9>ST#6)N*|N)FOPj~UfIv3oNSHIP*8}9vTN@u@QN|OU
zSHT}`7NMk82FTRQj@u9wzch}-60nWugpl53SW(U!PVE_K{P{N_+anSG*npVcen^OG
z?gpsyZ6`l%0uINiOMITH3oG2>L(C1fOq6dc!Mwv2`qOI^0NKI*^O)Pw(DX_D|5yF`
zE<&?cVgMkg%=RWw(U}xVx^PAMWdWimXOo=l&DQ{jpt{gglNO~$4IW(Bd%k0Qo~hxq
zvHR{~d4kDC^W2uAHrK_IybgG@SFa@Wd>|pOiw(f)v+d+N?<q<p)zRna<(-875&x?{
z>^lnippef28L+3B0+zYSG_R%^d2ee$o}~fk_BJ3>T`A|jP3>`XIVNNW{QPSFr$WF(
z1oM48F6B=+g;sME2e%_MLE20~)G@bXK4d0=|7J+2;cY+W+&)r6s8Z(e<*8bS2=yVP
zk$*sYLhCjGbA`!`7RCntx3*QPYgHjUeULSgMWPz%RSjuye7?G210<xeX#r3}4jw=t
zp5#$<c!FO()+w1)C;=}`MacF;x44he&J#=Mx5<!Dla|masuB_^B=8UT-~Lfby17d?
zL^M_)0k;~GB<=f_#yM>~^wJW<L@U_FmbA3At=}RykNj9z^ktAxjQU8vfGh|>Jyu`x
z{Y!xr@J2q9NHUH6kes7O9gb%Z`HzMgYR!g(x*(x<UCNWx1RWyu6&Ri5G62v+ufEB*
z0CN5ai#gLQvo=I0Ii^dg<*pGtHj;KCXY96nZ+H3J>mNNxD6G>l%Y!6913aeR^^Ivt
z3SA$;ks|VhUUKkbr$tNkXAp=866&#ngi@d%f`qP66V7({77_Rd{O|rKlr&2P5rKER
zJ|w3BGPSlfL^*Tkwh#eHkZO7AMLi`=H9mYn#P{d*UpIXmDrC>nTDchYu_Q57APV%b
zQIG#io#f!)=o4a0uhl~xg92s+EQ=@bUkwRe+z$yUv>LjgV}$y@W=V@X)Buq4BRzu=
z(8%K$Bvx%Tc183X9asS5x>D%CA+&jjWaE#K4?=mfHIagAw;hmJCxL3={FVh7uk;%>
z%)6H<P|P&3(ert6*5&N2O~ev9y9^R)(`u*+TDcBi9r8mk*1o;662@|Wx|AIT@Dh_{
ze{ohk#}v!RG^1hY;zCM>iYZ>ensa$}5P6VLuK<zw0ZO%7Li3jT7q^(FA{XaGD+2j`
zhKaZ17Q|OwC6-Xy1xToU<WxM`uA(|XLOK-7wTW2wKSMKT>G$|3N+(6LQxl(Bu8Kyv
zv!f+qK+y+jBvjux#lL;Tu?{<&5Y!uR?e-u^Y}oW_B&F#O<L5b3>*kxJL}PKT-t1RJ
zZL=Tn@`xprp9KlkYYCm!H9~zHvgZ|e=z8<d=2`;4onpC%>RpmDoo39PZ;Bvk05mB{
zYpAVxE3JZz1_|{F$n*RFOZ6f3?wyFvTe&rn2Uka{X#y{fS#jgMyNT7r63X$0gqnV8
z2;PTuN<$yP$oW)AXowB7iu73SZDMhfJX{b#8ZJj!b8Ftn5S5*C_sP`n-|l{$75Xz!
z;CI{6W`)vO5<ywq#+cQaFHSK@hnpP2>*~lmNsn?Kp;HM2)c>`hvC<MJG)iOTj>{Z$
zDwg{W^ydHv7%1$+uG>fY8)o0R*fUOEPVp6F8J~X9#!OeOoUIMz`m6NCKQFBOUY>qz
zu(iNA%$@1$eLALHk-afpmKW^nBk+`;c|Ua%p@4QYzBR?&kT&T91BJ79bST({p&U}&
zfk8sES;#R=%&Mub-Q8svZmGv?<kLw&s$eT3keENRKk2=Hwi5kGNYwIb3`Y!9*5M5c
z?9_%+GrURX(`X^#g2`eRWyN2Ns{|9u-w6q|4J3UMzTDBJP_7MSJ@9}=&LTevS&)X&
z%vmLmUa#)0_m)H_1sl_h5o(Qk=rPyTquQ;4hKBM2BHzIu9^ES@FZ9D4u>;ofh0)LF
zr-hGqYwEo2?Z63Zb(xmBcKHYb5y9&a=O`ppuhq~g=!Wj-QYhE|nn#<u9-cZYJeYPC
zQ6;mehQCDk<coQ6(GrwR$&BHN^>V(BY9Dbm>j}#C)Ld9a&2-QhhyrjT_RgjCdw2PG
zJ(5T7aN^Ew+9NLZbqyqtPe1<nkSBzM-a1ab)6=Cm4nsNJA`}Y7Xihz<Mip>^O%c?K
zUbVLF$*7^x%*awSq20-Vxz(-2&AGfNvKnQJG(Q_u3P_Ec0o$Q6Hn9Ge4zohcroz;i
z=EQ$+>0?e#M+(t|w&XxU>QR&LyrF2)a(5&;bYbo9S7IF31SlfsX2rOVEV5j}P4WJ4
zM_QdOV24t&IviMR#+>x`?8ApEn+FI@ZRUc;AQVVWExPk4W#6v$6sJ{N^z}?Fk{@pz
z8WeLdibzCILu;J+F+N30=qRosi4I*@`=ObmOf80l7@t$=S8B1$VU)d`AIVJ-5*5o#
zI4+QtE?QI=4@B^J=&w+oC{hi7R4BlxQT~{>$5OX9y%YZm48@8hy~50GrY7qHejWF#
zoJc^pm6Mb}LM$zzBQh8%=$3|HG{?ZBIZ|Z->47@mvKI9}aNckO&2X4BEz54!DivFC
zFje%@xwZX0j1-pPgm4Yr4MsubxtKrxN)9Wnw_VsJ%H;dLI`_?f>$NFYi6-<f4-ztV
zo_gmMMWKXgIUOVPT?AyBM^?`qg!wIk9$l&5Vm3+$HXDHIl%W*}ofW%!%MJV2VUe?-
zhO~q_QR;p+h;d7(oA&u}X@CfIuA66SoPBal_r#p1>o*Zi=(RB<#2qya5`vH5I%nnj
z`@d(Q*{7k35YH({h&aKJVKLmrVW`T(iwzDjX(+|p@k$WXP)CHA?XR(N{v0m-sraqH
zUOsbk@x$`o`QZ=5g|7A<!#7R~l8uZa6cBFZYz{&~5n4hDs^hxby7UN+pXQG;;P+4k
zt=GXimFXdwwB~faX>DLk4VvWQ^e}DsjTx4|Q>L|qMaD++!k6{Jp9?BQO{#2q=yJ&+
zJ46~-lWv!mRW{j8@^8zp=B-cW5Kd@VFC;V{CVilW_RAc7bSzT9&r^x9Pb9&kA2pe+
zue6D%RCL)|yJ1ZwJoZl3Z8JpmAY)JL*uVMF(8~S52^EMrm1Q4z`;coQwz6~G{Yx3P
z9HHXPUrYWq-nE!mK)8mI?I58H#~HXE+5<~{bn8B(InO>e$pjV+0?G+1a5hC^V^V_A
zCc0Z0QAn+O_t|`&Fz=LnrIcegNT?Jusp5&0qu9?f@?B27bk6uYkW?l7r~L1tH&2cc
zPv{T$JjBn}5K_uBdUTKw9xNnd&=ENYVz&dh*|JgAw4K-WGCDDtLwq+|FL~imm;C3A
z=frGxjUSp)(8M`a)=A$dv3H{08_ryNut$}<STFr#{iwHLbE1ev1T{2dCM1;lQ$x6w
z)2XbF<~WbgIbIqo7sfvROyW@4-jfkCF(w*QdmcK+z+%b8Pu6c{n%x^DRH`yLW%F4j
zmvq?0CFFIYLrcAzdGh?<dMsaDT0MzyLgO}Rtehs=-Xqh&NCDnj{V3B)pq0~akv62H
zvbdh(mNZ5c%9mYb3b*V;HwU;Y-%&TbUo%K(J6r!$X;b(#!RaAheIk(Hcz<`+!jRN)
z-_kZ-vnICU6!$|jmqS8%+DKuyYzd6zbSmqEf8+bCN%nVeKU9O>EAgP}8Eh>q9`ekA
zJNi-UA_}%htDy&9#5}E)3o8Q#mDW!jytt=-SU$A&Ws_3u*RwfBX6u7|R_vz`uA#fD
zaX+Nfga)jfz5d3X-IZL5=eVhqQ5h8;P(#yiqOt(TTjP_*|5AjqZ8d&qp2OONF2D|t
zbW8qaQa=;SJ3H17vA(hIQ&h%`_QE-}gd&0((s?WQJs7>Ixv>gzTdrhahlU};&Fh#Q
z4(5hKrg?dwG#krf+?`MOQPG2hf-l|GL)nrui&k{4-cLn~N~f`Xy?L!x|2AE0Na=GY
znowyx)KG-;WIWo|$s22b7<-H+n-jdf&qb_u%LK0i(xjgz%hJ<_Hs|F_>DL@@*(Q(Q
z5P=hV3ytAC2X_2(4A{+e`#W*mdm+Z0c&MApWi5HX__NW*Ya@T#L?j}pp^<njCxL|C
zP!#)hF{hx+;&|cj4?H@LaWl6ihAn+^RBs50Ll3|bZ!b4QYHnm6Rn7F|^9M8(8~g{Z
zAzo$din`Q&B(!Likok!X=H~z2<on{{0(&9>;gLcYp4%2_2_2xo`;czEKES*jY#=&~
z!s`&=soklr1zDt5D=(G^jC^fO!D#BKF*HW8`Ek~5y`!N#+xco-Lv|SHUt@$tHE%rE
zcjt|f+U&PQ<<hmPLxp>}cRq9y8_YpMLF0c~IjA8;#uD8l)DO*^yT;4~*mN9IBpKIQ
z+wPsSt&p1<9x+_fnkwd#W~~WtiscRvS}5W%KARvRH1oV0e{FLoJ=|p-W4n7T$l8^)
zEq3EKBFpMEui!U#LqZsg<$Ai5dop0OtxFAF&>$%=j;1|@*RyhGy*DLVa`E>2cvnU)
zBNNL7rDY0*{?2pLYwkQdF8&$HMQ~J{-8q0p$~iPY;T3Hy0Q}<UT?!V>?n1x?qo~Q;
z!?pz4Ian?yKLZKbX$c+BxjF@Smfi4`6)z^C`_8-PMFk<Q7CuGd7uM3~;NIcCDU-5H
z!Py1jAI(k0Y#U9m9buhsB4=RsWJX}js~~QYgf}ujIOC*H)rEet`Ri8dQ~OQC5rRhU
z%Y6uFnWLryZ(jy{z|*~?Pqz(iIgUu*2piclf03d7o%8P}Rfk5Gs%80EHf*)yh)2!E
zt+@k)qHMv?WFaE8$u6F|q+yR7Ah9hj<Jg9l7mS{SMa6{9I7u8JJWx2whlKKApzxle
zD28rG=bnf9KXS-kc<DAJ2W4D$Ig(x)dNe=uTb@3vfO`DQR;C`t95QRmthB1opBjqt
zQ&==Hv6oZ^ZRPVD=rWQX0_^<O>`D^kPsqA_YG2gk{lp=Hgqr_`gp#y`N+2Pf>SEQL
zq$1106YrC>o19wYxFpYld3#3o-KJ&133ARdDpqY9$eH95xa6=IP6#h(j4$IMOJpz^
zB>H<?)zBlJ2!%^$1RO$ssU1SX+bIijlFbQ21PKMshlFCag!WT(k<dU7esEduiD&I{
zFRn!aZ$zp(=?FS(7!yNiA^saHt{<%z3}`5!MnHva{mJBv+6hVI$}tF44oD(<^CYr9
zxqb7C!jB(!69x#kauX6DA&J%x=^i22$$El>!AhSNISIJ7+~o=^iqrWe?Qw=?#vr`M
z%1@y(E%cgQQ!nc;93Zr`3_uM5e{$Up)b;P*-4Pm>%Wyt~tWh}!28rD-OEwW0Z$m;~
z>9C;jqgF%5Gn6{j`Jnx(4`?VLrVF3+VP<IHU9v4NOAufxuMdaqT(Qi)IL|3Y?gNCD
zQD4ngDH#$hFJZyuR2ty*vTfjGj1>cuF|x)JCm~!zFE`*Cf`s06DRfUmFrz>ba!x`O
zAtqBVS1R&Bwd8H9h21~;{*=w>vx3j^IEx%c><Qg7UmrH7*hD_T{ZJ>WzjK$Mx*(+W
zZR6MJA>N=`)nu5CH3`DhQ&-mgv3+~VjrT-Bf`lI7*CB6c<zOfHLCO)GixeOs6HUFG
zN$#aem5Nd={@jw2+IKUJ9GF%#8B6C1xiqJv%Cd7tIH4v;Xa#7Z7Mi}TF7<A^obb&c
z&zDjIaxbK-RlLv<zq7x^?Av#pC_b8$f*D@w<LwxPcd?e^v7C;j6#k3Q)Qn0+6TRA+
z()_jUBg2oJA)QkoCCTRk+LS#Giv%uWwzdd=#bV{+#TNuA(>!OAC+(QY25#aeI>V4G
zL~m?#xms{(%G3>n5=sch2|4406y<m<r(=Zr2gg_p3>xwC2&?zqu1E?_GHMnG{8=Nw
z;^DK57hDg8g(SF!lHh9t5F1x_^6vesRFiq^yc$dez$rC~AsMbVRu!<ZpD;ww%8d~~
zLg)Y?XytT_P?N}H_D6W`obU@%9+@C4Hs?0;++A?Sl4WQxeG!E$XjU-_s&=}`X#<2-
zH%N}CfOYyapW~+4)z{S4)-s`jZN3<kvdIYnP1k<CQP4*up@m(LkOL(2p-XXC_cZj{
zhH(tf_)zzez|kkhNXQT)1Ms`y+Y6Qq25o996$m;j8KKRyLL<3@gqYKh0G@dUiF3lU
zv{r^$`^XRsa2BhiJd&ob|7zAYA_@I76cS=-2_4lvLMY{)N(>1tXbJ`@5f70fUy9H4
zyt0y}<t{yvC-J=*f)#~7EE3dSJvcyURYL;Q5Rwu7<)rb=YXOpIp{!cL=JJ5PK4z-8
z1fPhyh^wxLR&EWRQvfhhfEqeRN$7ieS$C%Tz;F83Y|`l{NC^2wiVY*NK^#3daP!I=
zHsXaw5BW0<NN&-+nV0X!-2ZhgbAZqq=GH2})6Wn#SGqS}&rn6rl}S;+wj<FQz)m}0
zhPY=|NXXnB5;E3mNJ;5gr(=1!wqTRu&#>2+dC36C=@}$}_X3Y01>R|=KA65(z)jN6
z-9nlC;;hLTf$5t8LMt0mt5hhGQF^h;sHa|}D2<j?OK=StFtG9B1>V;`bP-po00~{P
zfQ0B;LdPgeAR*l<ms4gr9mn&grm1Z5(Mn8DU@3N=>g1E`*CG=R4L9b;_(k88R$Qyt
zymOEcb7K`ynP*4~sy=kyq=3?OP(vu&gT!J0%h2YDs_);X5$T7D;~*ispOFH7AJVnv
z6eay9q7)<Y7-QHP<hXlVNlEm@Wf`ESgkj<)P`^OWm7Tjt9U!zc8YBHq2DG8Fm$&>6
zI~%6SGR-JbRH6dmuHeetl;^{46x0!g2x{o*Y)D9?B~+FHqitOyq@deqL}arnc`jQ)
zl5mxauV*F2Q>%rCoD5Cfc+GaI`!TH-AEbo>_xbpJXsNZzGl_x7BLvC6erQNXJE4XE
z$_}R)GePjl(mN%KHW?8G2+zx1`GFJCL<&m0)JN9{{U}3oG*gzNnv|5w0jNJho9Xrq
zo(tus(~WeRycY|ca_96!MeOkbLa_IXdcu&zjde{vX5Lt%?v%=^d19`ZV#dU#S6r+=
zDOqQ=pD09-kPQVA@`V~&)ulK9%jKTx+ADZBiLSX3(Mx!+<V{6FO!7+Z5Bat1<xZia
zD*Awf<y^tBF;1>eo#E&OjfSGiRBM!MJ%K9t)yGA}lr&nLDH#F5u(6-X7^`XQulkcH
zK)8m4c<V!mmQWe4Azdq%`-o5iG>_ox*chuW7Lb_sL2u);AFj*xJNhA-7gKX5<Ijxd
z_L{Mwz(zx8VJ#YPf(wUZ_;wrZC`qq@?++I@HCKjPSX&+#>o>=t{2YOW3Xssh?;#;E
zB$SMo%jqB?cqgLR{R7~&l{&^Racz*;p(*xo<LU^zC4hRtgU$;+yYNlZQRg*11BB)r
zP_60aLJc`|SElbHrPCz5GJVcv3D?H>q+W-$^Wn-!!X$)iC<iZ>D};V1nWEgC(X-~M
zWEXLt|9`?KeFs8LA`0)UqeT+3+i*Zid${G_>|5*8tn+*JdDvM-EV;Y<i@}fZWAFt}
zQ}?*A4yCP#O6R2A`C#BJX9Wi{^bR~)Zz!#c&zggcOerk7N8mpj5@O*wg$OMng$`P|
zJ|oKPI|i`Q=MN6xf5s4IZlLRm8`BsT>CC27#kHW~e-_F@BTt^36$-31sqJZDl6l{Z
z$npe`Qe@o(gtbY6P)aThB^eu^q<<^B^1J>fA_)~V78XH50{DUlHKdR^UVNfsH&$4-
zE#+vMQ$`1%wDo=noqF2npVsv|O--m#2kDiycYa-2lkhhDNX$<OO^d0tH8Uk4nXjgZ
z(?4I!B!RZu5;}T4$n8Sc)2XIk2*jg#z#F;`0!r0NsD#o30qN9KA9$SIVEbi!<hIdg
zF%n;gaqF?@krAuDq4bChk-hg^amtyVLy5IgF-{0C#+uS1nQ3f6&M+`6PBrMV7{&s#
zuch0OER8!3{B82C<MmY{5kVs-_kx6$!I?2DDT=*RN6#mhb<7R*|4{HU&p(1kpJ}78
zjSlFn_NcxrYP{!|_Po3}%O=zf&PiD6>$E%<S~-my3VX(5&J;<l=hoA$pSzXvP|aM7
zdd*ynw(|485(x+o6sq7jbp8enA!P~dGuAmH*WVt@8RqK^pYXcH)Mde!ri|hmWK$)f
zfBoeWzzo=)R{c-;CzsZ?KMz7en%<P@1?r)*1FAZO^?vD#kWO#Z+Q+=um0WdF->ZJr
zO9I0<95p25{VODt084#fu)UAE<csbRg5^FL&=aX(G-nlv2G&SPs(tP`+x^Zl_nm01
zCM{l+e)8tww_))(Aw20brBmS?h89GGTcM-Ox9O9SC3o(!Z4B>M92%w;?T;c<LO7wr
zg^<t%7$~gjQWnY_b&}AJ8Z_&n8Xo>mf8ZP&@R!h=nM3EzUECN}_jf>Ans(So!GMN>
znkDX`0i~Uj>jTOc8CiQvtf!cNr66^WGa6#O|6WNrq0B>&&}FD0nDi;k=z)ZEEmD9x
zqHeFmpn{x&(7;={>19jOB6jaMI)*9?`=}P3O0Ry<HT09Cb7$DkSZ;c`L1Y~&?yPEM
zrEjRKMO2B?mYINhJ<kh$kBUYUJTwMs$gmv}O4Sl7fzuRp&dR|+Ax;x0>=c1vvHlkn
z^5}`Y#Dpw~3Qihns{A==WPQ$@0YV|hhI0?7BuQ;O2_GgJNl$%qp?OWAjC0%@l;HgM
z%AbU5=pCLooe$^Gu7s1ZVB%Eg2=(`o$ew>d2SYhx4fa?JCp}-1Got6l(V>Xq@Vq!{
zbB_AWU;6(V@9e_~;n8-8&9{n9i34|8icGPR6A``fe(_!-B+qbG9zI%z*y|APhipzm
zLP<ZPZC%t*|7!{@@izq=bQ&IvoTE&l8DzTm>#YrDQh;24tu#X<>nOMrdHBfQfu8;l
zqwk|bd2X55sGw!(|4gC5o_^u<dhJ{c;o7JB2o(_|G;tIpG<YA<F)N4f@B;9*N_BL?
zLikBEX7(Xx$>G@%0-mu&^ug+lH@4BQ^7dD8Pmudx&&LVj8VWA^cv7Nv%tUX9HXxs}
zGyT(BpKf6zS(}}%kNk!C;As$%h#(=930oi9v>K|UI`lo2=v1i>ym0`j#h>utNiAru
z?{FX_HE$aq-I8iTntROy?NyOOetnPrUG!p&JKivk6ACcuaS^NBGLd-yEm+@VSw`B>
z=JA346q~{qoQr#ZxDW{lw{q9#Kn;a!{E(tlwgf&8=~f|0H;JOLaV(jc`DZntnucUO
zyz_69gmhQwvyp`4PI!BjH1%!R%$zVhwT<70P&R6kZdP7r?SForp#{x~oeLfmKjM;Q
zLkwnNhnB7)G~R}U4&x=Kd~Kv~2w%pkV}$zqj7Xk$;K@_Vr+|~vd}EchqG5#Ooxs)n
z7gL+byHpJQbp>y?{i#|4329cWji!6Es;8Dmt8YH~Fp5FlM$g2U)v<X}>7mTTDTyo3
z|4yWcAfbfgkdPQo+lHy_QXPB*e{Dxe+^c}~a&;JpiovY0=RR_)buVJ(lipXPB)PV8
zT6P>T@9^C`I#md?%_+iX_*e`|P3NML`GyOPO^vr8_YM4Ih{WjF(L?E50v`}eh=b?0
z`P!@x)R3-~DJbcj<Gs*y@!8#sMk+cK$o%;q)3I>?D+(1b?=ygr$hB?=|M1Qhmq9`;
z4;+;aa5Bct#t(;`n3~BL*8U=if_m$*V|08np_w_Tp?SE5DB3cGW4M*mt(-y|g|1nH
zXG%$;#Km9;R(3>g{^eQ;2AK8*i<`*EW>?C2<6UrS99hVAPi#`bSgstLD0?PP30`y8
ztv`opxQ(j3<W486WSfp&Kbr5^L!^Z8NMUv<B!rio!mN)D66zluW8u#mmLxRCY6^CL
zk>0Z8()DAFtj9IcEwilZ7S5e9WAZ)?At<-tLd13ZW3IPx@kwNV(}nzIwqJd4(}g6;
zws#4)m%Jhr5KhSJBqYRx+lS!$&>=jQ)2S!cK8|)PIQ1_FgwKtj3G71M6G!^ACX)by
zl+R1yS$g-5yioqfcDL!YK|*D{6)}(GUZxhMLq=R^%D*WX_c&Nxxei--FXG-@(k4O?
zK|()Z3!ZbYc0bf{I4M}StQ<bLOp`U0F|b6`l`J<NWqvnjxSN7*sRB?#4Hvk<R&|s3
zhqtuE;Vt8MqjB)|5B#uJt_Qbxm*sw}JE;n_<uZXZFwbV=^1vnMcCH{25hT<Di-Mg$
zYYA28oQB{=V<Y^!N)F%vW(c3mwXom)B7N^VC7q{2!(0T+Ke(wzPkcs~7tZ|fUrqg*
z!5CxAEo2TOB6^dKL@@TsP>^nKeRcMt@QXHtZWVxpVx#bJ3fe7rx<{zLO++vH3=vrf
z@{oCm*jUx+aQAW3yF5(zk^*wFGZ&x?&IjXV+uGGD2ML9};5)|WaSd*dFTN|!5KK0W
zXcALM{Ke$Im%4|r42YBv?uSAlAwFG8=qMHXq02gzQ}|KF6KSfp+Z*c7)L_<WHj@<(
z%>R^Q=`0r2q!nCJn;fuJns+$cwxFb)nr^*$ivTdmqyT&7=D^)zJ?CMh3}xY6l$TD?
zM}20^n*UGCqN_WI!UPH3G=+pLwN~yhZsl}}&?oxH|KR&_Sv(8!nGC8Nb+dTTZsnFl
z524U=vP~l~kKw->!U+juC+~(W<C>I0K-hb}g9i|ZCwQFLJs~X#>s0J4lz^8;!SUo{
zOWl`9HxWe#{~S2~Z;>k=DU1v_@u90yDO=+CRINjq)7K>J>_3Ai4q(iwCtNRw;w=UH
z*InEUxWVSXG$mQk7~?;zu-w%W7B}j@HT72r1Y|)t>XB11VGM>fOBPE7Y=4F=xHfB+
z@$4ER2|)=xGlYQN4uo<JUvw*!YooA=@J{_<m<O_$`nw=0#50I7X^}q%apS1~X-GN(
z>NdXh|LfNJUxyD83hQ*t@*oL<{XOEUeakAbQl3ed1U+PmBHO)gaUZ1<SXPg_p@kSE
z)C~#2nK38fiZ$K34#E5C&mk5K;@SqKq`PS8y_cI_#_>Q*se)}(5ByaIrJSbgzib=P
zGDs*!eJn{#7KlV1<Jx?~R7sQ9%k|TwT*+suL-$eTaYD;HAfazQ&<z0?C_qBTa6-D|
zhCadJjQF|-S|tMJNbC?n#5j-p8z$OF#1A)<O_MH4umijizvF%=DmW6Q>{Q{UshYNa
zKQ$s1J}mK={LWIEE>$_jk`O@w>ao*n@s?8kldlQ$M37KCEK_i9(rTzm*V1x*99W?M
z4_%Lcj!^;-uAg=B!>AIEc_brlxCMd~i5VQ=B1~~x_#xsOE0jG;Q&`XMWm9LX6%0v2
zVf?+`wTFO$Eil65-pFQy3{%=^(^C(l2m^#$x$qX8(8!<@@470h;Gp0Ro$A2Ddx!Bf
z!7Ano?UWJZL?5S4hT;<v@F^qJh-S*jy={NiT@B^UPQ;&BUAsL<5*s$CMwT@%=<3Ru
zdM45&FB*$;^)*axSn8aZHnfdULgR4_skM>93Al{4LzmXJ!;C_42L>|=TjvK%hatD^
zkZBuBr;l+YGgz)nfK|f`PY5zDtvlw*^ZJiCAvI2@S3s8d0ha1RQqu~D=TmZP<{exe
zt)}tEu^$vS&bzyUNJj)Ul&=p7wT+yLPsXa!HA1+R!}}v?O=sV*DTqASav0OyGBucH
zB9AZz2npq>6r_ORL*EX0_zcdW{b}X8?P#;a7g!RsEbfo#$$<wC(U3!xTv1(J`WDio
zoV$Y2#7PLZa%=Het_hAqhtuUw>6(>;dDGh~QCMwy)#cd@1kj8!4_yy_Wy`?_Bv3JY
zK!S%8_)Vx8kkBU{Ak@p#iw(9GScbVfd-x2EX_r;+=)wnMSmT2+4o5l@2nZ)s@+TzJ
zuC;QNI;J6*@rgUHfEsEe1J5KHXtZY;?8x3KwxTi{`3w?}D%gq$B<7FoPkQg4Efcc?
zw2?x$9X-}YfnaI7cU{u2wcMpoo73wZURRsG6H4gM7n2Ak^lKI*bXiO2w2l#iOWSFQ
z_~bH!U~h1u8YMF`?=0Euld#N^FSuaGAk#ovX%h8y!(ncR?^Y4|laT1y%Tv}EMdc=L
zFmU*B!ByE!y~Iwq#WV_WYMl2^Vk?n=a1EKsA)!WX;<QQzS5E6vEC-hvYejTTge_HD
zk_D=WS6;Pp8dB@dBms=4WbsWwL6qoU@;@KO4iajngT_FV45-NteaT&K&x^3OF2T*6
zY&+#NWymKJCn6C+Lh&dh^aPgryrC#7src3hT}o~DvB@Jfp#q;znWt7;XZpqaDofg&
z*aD4+0;{=va^K>%yp=XV4>W{S0EjvPsWB6<9V%jrF0XrP=AqP|N8VzNmfe=YmgM;P
zbBI(CBy=AZ1v~d@2~|KVr(1-eh(sDsbTt5bBjy=KW2>6tg1qPymP+XN!!}hRKpi?b
zJ^|~0HT{gTMH)X8Q~)&;gaY(btZU2KeY@ltPA5%`7<~S#bKmT@UL$TQ7Oq7|sB$MH
z^i4xZQ9)IHxuaVJjbF16qn8*g3I4-^G&)ITohgj>%Px6q!4)9Xrs-SK6wUM(=6`I*
z$Nvrxn%c=GHEss%gvv#So+NjewMoV#88GxrEE1otHwjpAWfH+wj(P#+<&0qq9$esc
z1lN#m5qkY|^$?>*q_<G2N;W{YZvD$g%@f4Y7`y`8>qwgQl-}&dnXT>Jp}YW1+4j_C
zF1Q<v0>!ySR<GBFmDYP*y^&3iSa)~%=V`-pcC8^25UwG$86?EgTDc>*AJREO&c!gA
zW7LJvqn@Gu2H2haW}nZ--U&3OVlSMM5Obg~9*BDQk<UVTqGfpP<J3-+x}ObVI0@Gb
zx}TQ@h|!ZqSrMF<S00px&n9|tJ0!Ho2`A({4PW)CgM?t0aTZ)t2<;r=IR#1VjW8rx
z40nkbqBb2y2Q#VZJQCNqqil7~r?+u9A+;J3Y8E5=wqt(QDYf6f-9H$fAvtEj-@+1U
z-B92gqMK8Mc92knBTfiTB+<c@)Bm!iL*wDDPtqJ?QpANOw&mDyVU}Y{5+nkH$ors>
zm6AMc>$JA2O*vw=zh=jpzcp%7W!;t%BFJTXq)ZW4X7kD%=7mH|{J8J>n*R{m_@Idt
zs`MbC@KG8K!R8d*TMGVN1Y{ZwO`VKQ6B^aZ^sGne<<T-aL54CeA%*9$vCGVD#*BcH
zXsDqd(8>iBh&h#IA3(8Wqdi>~#JqF1&Du13i(b@@8SO`Q6ZbTv@n_J=rQg9d1RK1d
zmD>*sNp#E);m6R1(&u=?qaUiwBHe42B+OooI9zB<2xc><oRj3L-!Hu-{DXY6FO=u6
z9e5FqQ4g4aG0F?9PU_O>y^6`o<4cW(nC`WIVq1Hd&^SS(A;~#ND9dpMPN*0sq*FIm
z&3WP~O2$2ra}ahrfO}I$?y_;idP{ihlDzL`NcRKHoP@c!hVV!ss34zHsXz;7Fk=n~
zD$-sZS)Xca9s%2t6H~)a5?P~w|K*^DoL@sia%kmVbSdRjog_3cYa|GtH4<oK9a>M8
z+1gn1Bra1PKBEY0?iJQ<pznBtmo%s$p(&**lT$XI)g_V@cF_r2J5l2*?`EDN|F<5?
z7nfE~(m*HdH%O?+9umTwH5%HZlZ4=v$OR9$>0kM@1cx(xM<0E=Wig^rEQ+K5q=3%W
zpcO)QIP$7{kWfLB{;ATY*lB`vj>nonG{NzH34LKm>bP%d8?RXtA1RDo0SPUG??W(_
z+lv#@t@{xCviGq`rney>%0?s789Nu2iDl{&dsllSJ*4e;nN4@~^9Pcn7DaGf?oSDo
z0fS2GC*lynUBj_wL;{I^)9!9m6g=_c*40lZ5S#OXR<58C{RjyqX$cj>35`0pw!Qxd
zo#T}R3EAs!EJ|qN8hehLS3WjFvFs{SxMjPPl`~WMj=JIfFJhjSP}p{{epP9clb8I;
z_r2>%1xAcDhhp>!tT-EmlVbAE6K3Bu9|Vouqa_efhBlOgfr8Ej+h6mgJK|{=AVr(K
z_?3x-c!6>Lf>Ei8SiuC3wr-3iUR|;1K~l}<_`~SWrQq{|FE!Iqw&KhptG7w}sj8yV
zX>4C_-rrXLHeGC3eOYf4k&Gar1}Y@vp_NcMoGy1;txJy&@Gy_i&ArxQxPsR2Qs#4O
z(U}K+um1HQSy-K|xE_pV#K0j5il@KdIEIpD{fnRg92_aumu&^rq5SJC%KHWig_Iuj
z@xthc51nRkK+{N*j~(0Ik0pu{Bvj3SghZOesq%m>62f~Q9x9-b!+4mp{pg!n!W$_i
zmLiJC+7vnNdB$6hX=QN?3CWuKUmE)3t{%$fRmNI1t=&gPi&jlzeqw_q+kWe|TK(k2
zA)?@DJ_iz#1wumeor6xip;YdNYdLh!4Z#MYJ#e`VV3XK1$-&odAml%ut(%eh3_lfB
zeJ%*Cp6Tyd=05XSD9=`NVV!4(k^bc(EV4z&(SN4@ZuHvhw?*aB4XQ(hd*N!RPGVy@
zNa$8KB!o|BgpUvVbdV72W3|TvInoC*R>8ewZ_ONj>RVDJ+MAI;yL?})vgD>NJ@(H1
zL{#(up@kv^<Fg48LNU+#{o^(=sdLw=7~9=zLDsI_R`uV%v53~t>y?m@0Q#XGxQrDR
z1?!xKV5qPs9!F$Y^ksfJ7HG;SdD*f7dtOtE=7Q3)Qgo>EvV*cc*B*&~MhdgS0B3g|
zpdmRg=PWtg*Um;3x3aDPMa<NUNa@Ir+jBNdA`TMNP*eyc6b@s#o-T!g3S&84Dy-L>
zWD`m+!jn1d)U!vsjS;~G$xFF^kxVADMc1T@JK20>>7^sxWB5=*ng_gv{!l|4>=2ce
zx%{7?o2!;JNUAuE7o<(=-lBiqTDMT|J#m2Wqz?&SXgp};@G=D=Yg!5XyZ(=TRFjDH
z2yY=W8VRPBU$|~*w0F~`Bp|O$P2iSg-Llq0f`8mEyk9bGaPERF7@90ZuxGn>n_sLi
zkpm>Q#l@LzXnDctNm$fm?g=8_hae%(3Y-v}y97&p_Q6GxI%nnj`v(y@0%zs9L&J@S
zFY4V?R#R(Ro#<klR;?yoy|-vqY{bCY_9#Dvg^G?Qlc;3RztW4n1OlUaJHIswws-!7
ztjnkN%?Tb)+_wo53f%z-Wx;4076lhWLbr8mW(+*b?-ca*Nfc(bZN!wSsmmlyvzL}Q
zZLGEN7ooY)wtk%|BmawmiGgzl2u0gqMy*V6otph})uQ;o6(ov)ZJawj?R};dK3=9}
zieoRKgzRCt9Na0OAyfhh=~j~@ev|_}_`&$3krug^nZ<6i5%Q)ae9{P0N}@HAH&$Ff
zT0drhP<)Mmnm|=0lPR_1dk<82AXGUZiR{gPA?uUda~m9=r{r!T3=z~&O(Y~FfzdW>
zeb}#yguc?H2Nq&5mUG&by|$>n8f$EuYxl2Stt>~yRYg!3f<;5|DGB_j0YV97JY<Os
z_>=2SPaJ*vtUE&E(izT&kTo?!NRgXiFqfN3D510XRG)CIh7>wY$k}XUbnZAw{jwz=
z>o#;DH3z|zwI;BqNS^t9?v}6~lL11@WUuha7_j%NDN^yC1^(ZYF*-a6Q;_BXFQEh{
zq}7muazyv6+>bO~!UF}2<#G;oM1<Yt@-2&3PS}rdCEM-J#I#`nc?x`3&jq6~cr4ch
ze=eaD)tAaJGA&@{v@=7Wj~A$H^~mTrLo!-DRqArp=<AfJO9^8Ht=#6%kkEXnA=qfV
zU-wphDza?O{s-DPo2p-CbJ;-dYGtt?*y<rqlGPM;6Qpy6j`Gp><oEVvZ+$QjZLg4u
zsfA{~)um{gukv3*mM^6S<kQpDDqbk>SN6A4a5%<(A_+}D4+&A=_8}O{9n)w?w{qKG
z>1j?K5D|1k>!O7UBu)CI{H)Jw;|x6}sp0_86P)6)c6y1gONPPRwq|Bb&#tQEbYM#r
z4Gnf4x+On^PZ1>8oq17DNkiSk7ogvt*MI&_So;IiP}f~Z$OF#*gONgc20k-Jr*5nt
zIh0v=GdN|oD`PhqxKrxLLCy#6I??rwNDJ+0^k@-}d-P~o?gcOS#yUo0<&v1QZ!y<O
z)P+m0eB2ZmXhVvDJ;{_gG!o$YJ+p=*YwNBOCLuhh@M#hx#CF!qj5&f&m(wjm{r%9+
zX%`wFNh++fK)5`c;!*MY+!DMUuJGw9tkEMCDPLabCZ|QiY1?WDbFl<PlG6a0TH6|;
zoY^^w%;Ki{EN;lxXO5A5KKGx%o{>dwe<6wyBy=9nZR0Da-@$dcx~CzSP%xQ|=X^L3
z7o46LBOx5l7WxIlZx<{X494`CRFa^&i4od7D>PDnps{~7GfvysZ+(2NTa8R*?IT0*
z#(tF)P#NPiB8uEkAfeCskdT9m=00>7kG6G7L$7TZnsvt1y(BE>kqN>wGz$5C`A&PC
zC51*6+tLuh2L+>`YNy-T!L{wbG$b5R0ZxXE{)t(0>jD(k)-s`jZN3<>7LeM^{7v3l
z1rb-)2sLzM4<y8bk-~>A<q<rV(=9^%U$aT4qo9V6U!)k5#D<UIxq*2rf?UN5wm;_2
zG$6Ufu#*=ix+S{o9MF(<IEH?Pu=8Zfs%tWU563_O+m1xn2X>*&LnIr2*d|OONJNkj
zeJUh`M+zUh6bCbwtkbEi4_xy(_v9JK=XXVuK9+^rQmCzdpJ#4$9L-6Z)trgQFR1<Z
zMTSPszgSt3i4(%_Lu(o$s#E~UD7{%ZGy8@}9W9hqOW0f<FkoP##0$Kyf9U#c6G4FR
zNFj*_TkzVo8afH<6m)AemNMVj6Mq{rOXVWRtpQDvdO7|TKj}q4r%TI4K`)s*jGlWt
z&L#f*>cs<qRx&qM0n|K0T3WSQT2Dbs*Zq_bivcV{n<uKie<QGF4wlR9%Z7xyv>H09
zA*55$wld2}6UmvT7?GWn88iVm)P0hhkN@h2RO!raW2cxH<d$@K!1AO)H<a9<s8Xqr
zjLz&+oZUC;c%{)$LSn7}m@u%>S_!QoQbIm!ppmoF0y?C7DTVK-&}3x_6wzrFHnM=1
zp$ZLd<o7<iog0%j@~fe#8?U!ZbwB3*`XR&1LV?!EEv?2plNg9R!aLbldMh34gc^d|
zR6Iz=Ou(N*u!f+KOTl|2xmqKq)WMWOzk>erI<zEtH(d!N?4yfMY){e~S!0PrR+H_W
zxcHES<5nh4gM@@C>RJZi#*Rr&Jkn6h>y*l>d19`ZV#dU#S6o`P<$3*AqP!69hJs%}
zLilwEt`s<s(W85b(~k&c7CumcGJUl37%m7wO!5x3Z97)>WIHzBnwF<1u&b%4SN^{6
zStuBzS;iVuhI%Ru$#RK9@}=s=G$~m#8^g|>L&ALLH1$gsZSo=v5Kc&j_jif4gy7b8
z-CI8N9iaC#vzLa7cw{$on4r73V_eVcwe!0kFOAL&QAWr6E%!@!8*L5=X+pWE8dbmv
zHbqb`dez#xC!>Z&Gb2mUgmxzb=2o{7zd4g9FPlLaB1q@~TqyuM@H84yz`FXU5}gVZ
z-~$Xuv(aQuC(wautT&Jbq}zD;|IvH795InpD%?Wj@D}g658%pa8;yqM96;A}bM*u&
zLHDZXd&%iE39n3_b6L#g8K2ba2z5SO^(SF~a1CLPA)#>Shv0fB1#abZj1V+(0U9HB
zg@du`QUHx<@B8lX<euL)`yJ*s<*$l9JmGw&$6BWa_Xi2pssjFFNfET$b#ME7Us^2<
zNG|EO2x2X4Ef0)sff8CCMJS=iHz6Sb)DT<>UJiRCb#BEP+_6Rp&}6rV(!s2c-sJSa
z16Ehb@9h?I^%oAIa1%a6&ncgC`Xm)L>S?UpY$M*hZ$@N!0zGAI=UuG2Hc1dl$vNRo
zGB!R*FS!P%J`)EB*N{ayB$TAp&|XRpT$ih3R&EfGQ5G8T*ElkjcG_Z7^6wsNO$;U%
zkSvovl#cE4NDW(XYk<(S7|gHVl*C;|N|D`cLal32!2-$~;72yMJg`dt60uvSA)!B3
zK|*+>05wz!OHOreq4AHhpF7)k)nLqtJWv<YoVDk}dB2=2Y)%&Jm>jzBP1A-Km-^g8
z+18pxl3^{_P}EPrVZT4BO0A5TZb%vF@9wXtKJX9kV$P@cguOdxln4oh;2n7LfBGTW
zl8ZV=s2^Th4KxdgSR#q-8vjaFarAVn#JC;Rt7b0n6JL-wt@+~l&1ug4n4c@Br#zEP
zHM1g74DQGihrF`jvdFXhu#seI%j?f~tl>w_A<)KY3Q3OVK|=W2cBr8}umw-|2=#x@
zkcOUC!R)q`49u>}Ew_nIljqZ@!x*gX44Z7bYw7PNzjAp{KF}~eeLHWcSX31)tPk{C
zgp_)t)=uWdu4L&+eXkoI?h(pIL+B$+%kkyfWvp^a&ljEZL;ZND;EB(zr@Sx+7LMU0
zJF^gSr{BH9lKCDFX3H3QI|5s$ui}Nr0PWg#|7gWM9|wy42;}Rwzqhey$g%bHPSTx0
z!i#oKr<y(4Mkpg_<(B^j3FX7dSgX2}yEA$&KGCt~A<cOXj<P7lOsaSy<tX;EjC_|<
zFP$^~4kT3x|0(~wsHbNjQkc@La1RZ%iJn|9Jh)2Q=`FFIV*ZtaJb57dGTLhKRYC#b
zv7Ctz5>h!%y$uUV3UyLLaC^%Ae^J=_P@Y0rro7-cO0J(HT@!>VofekR&x!FV2~TsT
zeBB-f{g4_;ZF;$NWSuHBx~i34x1p{UQ6)}WW&-N<JTHzkm}>Tra6-@gA)y3VE(bNV
zUl(J!e$Dn2{OEs<8d1q59d>aEd7bFcQaEZvt{pY9e$ODGLc_=dDoOQ`*6A_d%4-*Y
zp2u2tlrqk7Z%~5s<12p>PKb{el3-dtRHBoFK7x@8fdY;Ie6;ztWj@KA9b$8A`lLG4
zY{7z~l)HM7f%k2j)2t>n4-g8mGniY8ij&%VCM$l}NYlO__Ywrt1U|=aD3hu-jUb#*
zvF64KTkuv=6no(UuP2vvXn~jJH2X-}^(j;*9(YU|UXvc3JE`;b_Mz2alwW))!m<9P
zJh`an^~ym)M&F&AB?9`=lp^{J{fH$SP1E*nmojo@7OqVn|4Zg3LJ>hfROSsel=PF3
zPHIT;b1%4y@pzBbfbQfXzxez9ei`O6Z%--6e}4DZ(KVyqPH}!6#vY^bLm@UFPe$_`
zGgU!>t4ROk(EQU|r)^;)S(}}%k90rwfY^8&5}I-m5{lJYxqUD%r)&42j|j>04;BE_
z^4yBv6okeM^!iVbV{f?rQsZWFZJL4G`zy?n^UlgmCk6-wZ|`#vtKBletAI4=r^&MP
z^r6jp`BM5d$6L0MYu~#Nts(CQNJyY1gtvn0T;{Z!L`nP&1ArMoVtq>jlwA9X%i|Yx
z3y}D>r(`m+Wy0I5q#5nyCrGhr3)T2Yl6kx&&qNv$62_e{oBmZrmxUfLs4P{vf#(r*
zht|k`5NhV2hH7gdp%5*hG7TXe%bb1%QVY#aW1E0aspEi@nr^$+wyxKRayo||Rf&-r
zWgXI2F1OyA!uBCeUJj*uv#O_-$AF8E{}a!mY@^FCX7#c>Y1*O8MAUuG?8!um2oj3I
zr^~@+{SzxGm8F_DRvjbM|Jsg{SOSA>rYIjo#bDOh0iU9di%(<blipXP<h!;Tx9m7z
z-r)<&<!m+ESVyzH8P&OE(Y?)&PHonw4xx*;tUFMdWyA9IoIPu{a6gfN@Ehx{ct~g&
z+{*!9@b*z*xty-e&>RF*pMgY?6pmP}oBT)UOG)IIF1{$)RmCy-+xFpzD%E2l&^CAp
zTmE#;PomdUC-3RFGvCD2!~iix`~!seWQ@JCz1RLE5)mY1d<wU6aJLO4gug!M6d@%Z
z#z_F+)7A9GYk-Ud%yjigP9G0|=`=w@6OC*%-{y(_=<>Wdwa0~Q_rxbqYQg2;MA<X>
z2GLr>0#%J)b+cmq<^uxEhT{Bv_N+O<vNuEm!sq{;2!#cWb=o?G6ZjjeP7N<>qiDCb
zo6=*caU_L4R#PCq*nHiROV^JzvUYAt@?mR6B#fP0f)m1Pf`bbY*X_@_Nz>O{UH5~L
zYcPbu&k(XV<6|-M?mueSL@b~kjRp7^T6}9el+Y2K1JvISRpf$K1&=Pk^e-wfRe|U>
z|ICZqjR2flV!D^EXE<Mfg(DQv%z{Be<)9+wk$jwq#S!X=dR6{S_Pocz>dI75*%xtd
zE{$+P{47Yw4iZ{PQ69zv1>JfCS7!YLR4O*WM<kGB<gp)~E4&agh8bCpYq-D-wyIk=
zcZPHMlEJA9+duHbTDcx(#rucuSG4Ch3vAk%NLpZ?&BoPGM6<3EDI(~G7#)xhMZ01R
zR&DDNq3=L{jvBB5d5w^4%LakuEc?Z?4(FsrgFprYOEKnuHhP_VbVS|kNvs3?{ci>d
zmGz!@)-LzrS`_d`q^gsSpu>hSF@zT459eYWkz^1F2oL4P{SMubT)SfJBGsYqsZOQk
z;5Jqx&0Q#vgE^y4WVxli`5SDwG@s5_0V8Wc1BPp8694e7miPfe0bw6pTkdiN7RBlO
z{X%+D70TF41?T~q+a#|89?deM33b5>tMf;#hK^HpEl}tmuyUTE0Gz48tfkK;E6mnC
z-HoNQSX7f%a7k@)z*cGAA(&J)NGPVO!Yw|;%+SEQWLsXAAiz{!9}c(Z#xncjJg2Pw
zlW0OuX8$)UhZEAR>2j}aC{y<;;3`S%^6Pduc9G55!aTnXs3@>fBtTT_qN38j4qvMG
zcI9YeAzP%0<pRRq^BwGfAY#17_3Q~X;%aO4&M=o?O2jR_mu+!!ZWNJ-pp|R84+*gb
z{E)5@`ie=7@QPsaBnAknxR}YxiQ69+-?BPdMKh#fDV8*8+Ahtgp2DJD;m=i{0Wtrn
z5C{-K_(YGgeG^toux7=<?GoN~b|8{-^l0~yz)b`qf`q!*|INz56>GY69U3H*M8o)s
z^Kl0H*AG4qQZI{E+p{SP>PFBIQr7qO%`XZ+esUiq6xPXi@E{3-g&rHvP9WuDoxE9H
z67-NMifli0i(5}<(hL$(jr~ao&Wt&(bA<YkpQ}D!&dZz~nXV^loh5Mp;^_v+CI$dg
zs6C8XzdU>VWmtLn`Sd|TG3q1v0<s{)&m*kfce^4fILWA4An<360E>suGG1_<$bvaY
z=$b7g)C;W~B!sW})F}-OE(KTdzseDGrd~$+oc|oaSeTzXgAChL8l)sZV_&j<edGPJ
zmBOD(!2`lNofE<-0yN0O^|3FhDM{e%>66E1)dm5l!0X{~x(u;a?&4ZVs2xVzkPyBu
zw?mf_r-OtVT+$8$kU1pl<(YY-^vtk~OcNT0E-oZxpa!Md2??#CgKOK_)Y)nULz0@G
zKyCkJu}Uo#k69>pKsFm-VOw*K=3e-dI7CoG_Dr0RRzoMDhIES1;NJEw)4gE;b*EEo
z=O_AaW&*!tTthZcLny_ed-JgoSF<WZd9xGW!TgYGw;hn!utBwTZ1dAIFZCPFM9vC{
z#tu25hRF>}ofGo|39Q_Pgsx;jLQk|BI!Seagb4L?#C@CoCq8LVLpNN?poVCi%`Y#{
z9A#o6mC?+gh9nrUvj_9idajS%W_x&$P_KY2@dK=CPD0bW&s|fPHIXB8q7{MsiR=f(
zjq~m<8o!^ozbhn^enMmArsA{9Dm8?3Xm;6a8(QLeC=0{VRrh%mM36Pki?-goNzQT>
zR5}0>1rs7DB?nIG8S-ac1Wrh;(U1oTYKX4tOlg`Zdd6s|i`<zKt+IFZ;EXD2oBhCv
zxE4uG*|sUZ6ufbyhESDE$22rR$l%LLQ*SyD6pr<>S>Qu2H0BE~@JVC}KuX1WOPPnc
z9ll$S|Cb-)>CK7;h7xZ@Tv7Pym$HM5G<&5(L|sPh4)WaGx$mYBCm}p9*8``VIyb_d
z0#HL$x@P5ITCP}gVNH$f%c6lsJJyzM+YEzwRAwWeK>|_*TOtO}wq}3Qd;cs-JP;{#
z+tFejYy|9??jwA>Yga#{Bdy+WGDdW@W-<nEB!Pf%LL8V=aBkCPPAhdRQWy*r+G+uH
zEe)_nF>e=co<4gxmC16|Ct=kXP|iozpVIiDqbSTN;BTy=XD?4#qZE~!xM2%heTSKr
z9ujWJj}ewlmR4LloUC`0U_vo?w0&8d^*N(!8tP+{J+G)>h)`xpo&yx-vUI(%S1m7i
z7@El=*c60{MoTIwIbTP$!&uG-CxpMTidz15=i~zw5`OE7?>8UUDqvE_j=hy*6mH*U
zzm2hT6TyUXeIcPHjfNDsmD8!M4_~tot(7x10xn5O>{{#Oy%Bff%=B0q4b@=03-d{9
z7PscDv<eCj<po5lA)(Q|5!8i#m?O5xt*E2)sU*|k^5OJsu38c>HRP;kXZtRK39Y)0
zTRGT11h+m^!bm}<2=yy5bC+)X)SD&a+URi1h+Xnmx7#Ek95aGonB7Wa8dWx|W?13O
z*7kQOTcpuYPyrn@2BLs>Dt6=b)V;gpg-$0;jc9!St8;DkTdxr~77L<=eyDjeB-8~9
z8sYY#6ELTsW2-))iZsb>(kBa&OOnbuQ}_xkEa|dh3lM6<k1c76X8H^Bx{+%fNB=!Y
zsFY1=+zi;km5V;Lt?4jpOR`Z|7&Dwa9$fn9l=E~w(N-?w7<_#&hV4UegO?IU3OYsz
zuA9zIMqvx<!fnU{g~YNJ94M<XOl7dlv9v6^zz>)tE9~-cpMVL!4<8^jwV4YVgHWJ2
zw`k+D)%z4#vE$;m=<AtUBtPCbG$^KgCBatiBN-CnYOUN6-O~_W>5Ds;g>@)xMN~Q`
z?al`SZ#gSCn4x#z(RxE^U3}IYY-CDd(dST}NaKct0*o5vk9mhLb^HC3?_WWoXrYuX
zyuQuUWPQM|<GvCaYeOqn(0J=1Bm}gC4#R3J-O><TH|<;u0qGwNVMe8)$p*l1d)+ud
z_g+C`@CqdLz%OlQ&+{zkhF(KL8kSR=#mK&V%nw;scjaTp!2p?XPLCg7@b|vQy~X2A
z2pfd16(V#)d%5@%D|AC}<FpP+sK5V{HOXGn2Y%m~<hDw}<E}_KNS~A!A>kQ>+y@z~
z*yLebr?r)z+a`vA0<JcpAd9-9evSE1mTT>n%iB{>n+?V+{t^xxE%VRmlSF2Gw1I;2
z6-Y=tY8p<c6jp8P+<GV&Dlp^W!IO%1fMSwaCc|)IoIaPSU#-ee#wDa!dTi`6bDJ@`
za;TW?uOZ~m5pycbdey~}4x6~8h1IKCrinNX_*e{&AI7`Z5b1<8q1*|4fmgV8p)n++
zgDcjcp>rvLh#2!l$kK#-J7*t+;v45-N2eZ)6!>4%f4)nSeQB!My=Z9V@Z!{<Qq-i%
zrpG}p@v<|K1~t^5HFhzb!qn^7(SCkmIkAB7U|abX5?ZER3ce2(H0s_GydP!2@1hDG
z{a#y@eMRn~n)G}b?K-(83G-X+?lE6)(L$r;`Oh0$a6&(DLIwGpN(EXuD(_i&{_(U|
z$IkSkyCc+Z{#x>{@y_<E#3F)(a^FKj8ysigR&EcjAzgYN(w^og_D@gbWnqxKLsH>8
zs%d{omc-j2@_uzVOF7Qqrv2-PKaLD&XbK#PamwZkuY`Jy!sefP=@_%FtXjzXx5cNi
z=QXj{RgIN%S_}#0YX~XiaFp{E-74G084bj9^sju{Qin6Xjz07=c`>3<EQ+K5Boy=B
zleBy3=5<A4I1XJ6H8iE5iF2w<-CZmxvX6b8Cl!ZZ@#gRqy=%TuzUQEK3D?m2&5%%@
zRzt<OmHYpwp^x;Dk!MexE3gl7Fc+6g6w=J}%wUmKd;7|Qhcdr7XO>*dl1RoZLo#G?
zVeO;Zf?Bb{=*`mv1b8WY?8jA%=Z`O+uzdXc@gICwj(<1q&A51<Mc#A0<(`EehVFE?
zGz2W9WG&#VZ>r6|V-{266p*D*BPs+V0~+9iN~&ZO=1WC`DQ+yWvz6#6*Ce~njpbpO
z9@6S@+g<ZpMYq36&W&x3(_*$+Ih*8Mi>V4cIYW8xb>I3c3oBATyl_0(6FkJqH?<;m
z&N2A^{`$}RKbyeaZ;%0~g}<Km_rw1^WXOn0N)>+Us{th^`+C>%vfi?#4n^gB^w|@i
zZnJqGL(2m<8Q&D{bX%TVxZwG@yJq7;)P0ZY<~D3s@O@5>Z$5Nog5%n`Q(h*9^!(!b
z;>nSsF|~qwkA9!q;FEY_>h`y_f!nk9tXqG4`r)mMg7=c;#;Q27z_5C_o`a8nm^JQ)
z%>DYYq4>(_SCnH1%a@#OymG#5=>*#r;jG5y^Tk)z*VLVuVO_u4a<g@9n{e_?pHcSN
zWhte~r5F27&#7=~d%e!ke~WE!iwFGe#W-=Br@`!Fvra}u-e*3jaB82if8vHOf4{oB
z@XGp6XOA!ckvQ+Zz9hkdmUehk0~u}dB=-CEKm2Jpy8pj_;e=@a&w$J23}eH6*CxK*
Uz`&q-0C+$Yy`3>?AI=Z}0KFA-NB{r;

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/payment-request/payment-is-showing.https.html b/tests/wpt/web-platform-tests/payment-request/payment-is-showing.https.html
index 0ea02808ee2..d5e04a83d0d 100644
--- a/tests/wpt/web-platform-tests/payment-request/payment-is-showing.https.html
+++ b/tests/wpt/web-platform-tests/payment-request/payment-is-showing.https.html
@@ -7,8 +7,8 @@
 <meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
 <script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <body>
   <script>
     "use strict";
diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-canmakepayment-method-protection.https.html b/tests/wpt/web-platform-tests/payment-request/payment-request-canmakepayment-method-protection.https.html
index e221034dd4e..9c068dfe001 100644
--- a/tests/wpt/web-platform-tests/payment-request/payment-request-canmakepayment-method-protection.https.html
+++ b/tests/wpt/web-platform-tests/payment-request/payment-request-canmakepayment-method-protection.https.html
@@ -4,8 +4,8 @@
 <link rel="help" href="https://w3c.github.io/browser-payment-api/#show-method">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src='/resources/testdriver-vendor.js'></script>
 <script src="/resources/testdriver.js"></script>
+<script src='/resources/testdriver-vendor.js'></script>
 <script>
 const basicCard = Object.freeze({ supportedMethods: "basic-card" });
 const applePay = Object.freeze({
diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/generate-test-sxgs.sh b/tests/wpt/web-platform-tests/signed-exchange/resources/generate-test-sxgs.sh
index 73c20801a0c..e3988ce683d 100755
--- a/tests/wpt/web-platform-tests/signed-exchange/resources/generate-test-sxgs.sh
+++ b/tests/wpt/web-platform-tests/signed-exchange/resources/generate-test-sxgs.sh
@@ -577,6 +577,22 @@ gen-signedexchange \
   -miRecordSize 100 \
   -responseHeader "link:<$inner_url_origin/signed-exchange/resources/sxg-subresource-script.js>;rel=allowed-alt-sxg;header-integrity=\"$header_integrity\",<$inner_url_origin/signed-exchange/resources/sxg-subresource-script.js>;rel=preload;as=script"
 
+# Generate the signed exchange file of signed exchange subresource test with
+# header integrity mismatch.
+gen-signedexchange \
+  -version $sxg_version \
+  -uri $inner_url_origin/signed-exchange/resources/sxg-subresource-sxg.html \
+  -status 200 \
+  -content sxg-subresource-sxg-inner.html \
+  -certificate $certfile \
+  -certUrl $cert_url_origin/signed-exchange/resources/$certfile.cbor \
+  -validityUrl $inner_url_origin/signed-exchange/resources/resource.validity.msg \
+  -privateKey $keyfile \
+  -date 2030-04-01T00:00:00Z \
+  -expire 168h \
+  -o sxg/sxg-subresource-header-integrity-mismatch.sxg \
+  -miRecordSize 100 \
+  -responseHeader "link:<$inner_url_origin/signed-exchange/resources/sxg-subresource-script.js>;rel=allowed-alt-sxg;header-integrity=\"sha256-$dummy_sha256\",<$inner_url_origin/signed-exchange/resources/sxg-subresource-script.js>;rel=preload;as=script"
 
 # A Signed Exchange for testing prefetch.
 # The id query value "XXX..." of prefetch-test-cert.py will be replaced with
diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-mismatch-iframe.html b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-mismatch-iframe.html
new file mode 100644
index 00000000000..f05fcc99f83
--- /dev/null
+++ b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-mismatch-iframe.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<body>
+<script>
+(async () => {
+  const sxg_path = 'sxg/sxg-subresource-header-integrity-mismatch.sxg';
+  const scipt_sxg_path = 'sxg/sxg-subresource-script.sxg';
+  const scipt_path = 'sxg-subresource-script.js';
+  const wait_for_prefetch = new Promise((resolve) => {
+    new PerformanceObserver((list) => {
+      for (let e of list.getEntries()) {
+        if (e.name.endsWith(scipt_sxg_path)) {
+          resolve();
+        } else if (e.name.endsWith(scipt_path)) {
+          window.parent.postMessage(
+            scipt_path + ' should not be prefetched', '*');
+        }
+      }
+    }).observe({ entryTypes: ['resource'] });
+  });
+
+  const link = document.createElement('link');
+  link.rel = 'prefetch';
+  link.href = sxg_path;
+  document.body.appendChild(link);
+  await wait_for_prefetch;
+  location.href = sxg_path;
+})()
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource-header-integrity-mismatch.sxg b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource-header-integrity-mismatch.sxg
new file mode 100644
index 0000000000000000000000000000000000000000..ace89dde642621ab8ce7cee7dc2e04c52cf1754f
GIT binary patch
literal 996
zcmb_bOLN*V5GL3Bf*w;Jp?(435o2Zugv5Y@!z;Kq*%q=B*;Xw1#b4>U{hbw|WYXz$
z(nF<_c2>LJW0w|46`e+<V)%>^dL_$hy)7yHs#l$6vnkU6MbHyr;rbv#P);C?)5L{T
zrUepd>YM^1e@i|Kapmk=<?IIr4#b)Z6DCq0)Gu3ll`PlYbi4B|@#6wNe+_GU=!03Y
z-97r(jsYjP)_9PawXQ#=diD4<O|UMUkmb-32?lHzC!xe3Wgj7Yqaq!!5g1CY6DNY^
z0S0xotElxxT~QPb79`*_UPGNmtHVP<#2`unR_cNmAl^$3gI`2Mr6Fis7QJfT*hAxC
z^z^bP<)#fnsuoJhjJ8`Ai*dd*p*c;|)o40dY?#?>VT25SU~ML;`4HMcw)XEAMmPv}
zwRBMg@MXMoNUX++L9+R9u(%vlwG80E<0!=6gm~likpL%eq*EO!q)7Na!a?+GpPlzk
z%Kme~KRkDnfH3Ka_O%3J9bg>id|CkJt`|u2A@E=#z7z8}3!+kEs}OIV)|sV1<8FJ`
z9$~LRGmDVn+MAAYyNLD#N8ZfUg)jddC*fdY;Aw#B^p(N*X!5rE-euj+uY+=4b~nwb
ze>-0xbf25GGS9Zx6Wbl8%Y8;(LMt72{k493MHyfz9rB5qxiKG~h>5HuaQlhDg2{)?
z&@T8AB@{9}WjnEBozh_B#$FJi+57I5<MDc*NAuyzwr(yCCHm*RBjO91aB2SPhtTiI
I$He~mPo$eu8~^|S

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource-header-integrity-mismatch.sxg.sub.headers b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource-header-integrity-mismatch.sxg.sub.headers
new file mode 100644
index 00000000000..8f1b47ef068
--- /dev/null
+++ b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource-header-integrity-mismatch.sxg.sub.headers
@@ -0,0 +1 @@
+Link: <https://{{hosts[alt][]}}:{{ports[https][0]}}/signed-exchange/resources/sxg/sxg-subresource-script.sxg>;rel=alternate;type="application/signed-exchange;v=b3";anchor="https://127.0.0.1:8444/signed-exchange/resources/sxg-subresource-script.js";
diff --git a/tests/wpt/web-platform-tests/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html
new file mode 100644
index 00000000000..8a26b210a09
--- /dev/null
+++ b/tests/wpt/web-platform-tests/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html
@@ -0,0 +1,144 @@
+<!DOCTYPE html>
+<title>Subresource signed exchange prefetch.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/network-error-logging/support/nel.sub.js"></script>
+<script src="../resources/sxg-util.js"></script>
+<body>
+<script>
+nel_test(async t => {
+  const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
+  const test_origin = get_host_info().HTTPS_ORIGIN;
+  await fetchResourceWithBasicPolicy();
+  const iframe_path =
+      alt_origin +
+      '/signed-exchange/resources/sxg-subresource-mismatch-iframe.html';
+  const wait_message = (new Promise((resolve) => {
+    const on_message = (event) => {
+      window.removeEventListener('message', on_message);
+      resolve(event.data);
+    };
+    window.addEventListener('message', on_message);
+  }));
+  withIframe(iframe_path);
+  const message = await wait_message;
+  assert_equals(message, 'from server');
+  const cert_url = test_origin + '/signed-exchange/resources/127.0.0.1.sxg.pem.cbor';
+
+  const main_outer_url = alt_origin + '/signed-exchange/resources/sxg/sxg-subresource-header-integrity-mismatch.sxg';
+  const main_inner_url = innerURLOrigin() + '/signed-exchange/resources/sxg-subresource-sxg.html';
+  const sub_outer_url = alt_origin + '/signed-exchange/resources/sxg/sxg-subresource-script.sxg';
+  const sub_inner_url = innerURLOrigin() + '/signed-exchange/resources/sxg-subresource-script.js';
+  const iframe_url = alt_origin + '/signed-exchange/resources/sxg-subresource-mismatch-iframe.html';
+  assert_true(await reportsExist([
+    // Normal NEL report for the iframe's HTML.
+    {
+      url: iframe_url,
+      user_agent: navigator.userAgent,
+      type: "network-error",
+      body: {
+        phase: "application",
+        type: "ok",
+        status_code: 200,
+        referrer: location.href
+      },
+      metadata: {
+        content_type: "application/reports+json",
+      },
+    },
+    // Normal NEL report for the main resource signed exchange.
+    {
+      url: main_outer_url,
+      user_agent: navigator.userAgent,
+      type: "network-error",
+      body: {
+        phase: "application",
+        type: "ok",
+        status_code: 200,
+        referrer: iframe_url,
+      },
+      metadata: {
+        content_type: "application/reports+json",
+      },
+    },
+    // Signed Exchange NEL report for the main resource signed exchange.
+    {
+      url: main_outer_url,
+      user_agent: navigator.userAgent,
+      type: "network-error",
+      body: {
+        phase: "sxg",
+        type: "ok",
+        status_code: 200,
+        referrer: iframe_url,
+        sxg: {
+          outer_url: main_outer_url,
+          inner_url: main_inner_url,
+          cert_url: [cert_url]
+        }
+      },
+      metadata: {
+        content_type: "application/reports+json",
+      },
+    },
+    // Signed Exchange NEL report for the subresource signed exchange header
+    // integrity mismatch.
+    {
+      url: sub_outer_url,
+      user_agent: navigator.userAgent,
+      type: "network-error",
+      body: {
+        phase: "sxg",
+        type: "sxg.header_integrity_mismatch",
+        status_code: 200,
+        referrer: main_outer_url,
+        sxg: {
+          outer_url: sub_outer_url,
+          inner_url: sub_inner_url,
+          cert_url: [cert_url]
+        }
+      },
+      metadata: {
+        content_type: "application/reports+json",
+      },
+    },
+    // Normal NEL report for the main resource signed exchange.
+    {
+      url: sub_outer_url,
+      user_agent: navigator.userAgent,
+      type: "network-error",
+      body: {
+        phase: "application",
+        type: "ok",
+        status_code: 200,
+        referrer: iframe_url,
+      },
+      metadata: {
+        content_type: "application/reports+json",
+      },
+    },
+    // Signed Exchange NEL report for the sub resource signed exchange.
+    {
+      url: sub_outer_url,
+      user_agent: navigator.userAgent,
+      type: "network-error",
+      body: {
+        phase: "sxg",
+        type: "ok",
+        status_code: 200,
+        referrer: iframe_url,
+        sxg: {
+          outer_url: sub_outer_url,
+          inner_url: sub_inner_url,
+          cert_url: [cert_url]
+        }
+      },
+      metadata: {
+        content_type: "application/reports+json",
+      },
+    },
+  ]));
+}, 'Subresource signed exchange prefetch.');
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_firefox.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_firefox.txt
index 2731feda5c0..21906c57fd2 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_firefox.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_firefox.txt
@@ -7,4 +7,4 @@ mozprocess==1.0.0
 mozprofile==2.5.0
 mozrunner==8.0.0
 mozversion==2.3.0
-psutil==5.7.0
+psutil==5.7.2
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic/resource1.js b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic/resource1.js
new file mode 100644
index 00000000000..7bd437364a2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic/resource1.js
@@ -0,0 +1 @@
+export const result = 'resource1 from network';
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic/resource2.js b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic/resource2.js
new file mode 100644
index 00000000000..09a4ee7b704
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic/resource2.js
@@ -0,0 +1 @@
+export const result = 'resource2 from network';
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic/resource3.js b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic/resource3.js
new file mode 100644
index 00000000000..851168c9dac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic/resource3.js
@@ -0,0 +1 @@
+export const result = 'resource3 from network';
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic/resource4.js b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic/resource4.js
new file mode 100644
index 00000000000..ea456b8db0a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic/resource4.js
@@ -0,0 +1 @@
+export const result = 'resource4 from network';
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource1.js b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource1.js
new file mode 100644
index 00000000000..6fd1de600e5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource1.js
@@ -0,0 +1 @@
+export const result = 'resource1 from dynamic1.wbn';
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource2.js b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource2.js
new file mode 100644
index 00000000000..3cf012b21a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource2.js
@@ -0,0 +1 @@
+export const result = 'resource2 from dynamic1.wbn';
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource3.js b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource3.js
new file mode 100644
index 00000000000..c8a4e258b8a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource3.js
@@ -0,0 +1 @@
+export const result = 'resource3 from dynamic1.wbn';
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource4.js b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource4.js
new file mode 100644
index 00000000000..0b2f7920b01
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource4.js
@@ -0,0 +1 @@
+export const result = 'resource4 from dynamic1.wbn';
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource1.js b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource1.js
new file mode 100644
index 00000000000..c6f751cec49
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource1.js
@@ -0,0 +1 @@
+export const result = 'resource1 from dynamic2.wbn';
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource2.js b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource2.js
new file mode 100644
index 00000000000..b4278ee1c18
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource2.js
@@ -0,0 +1 @@
+export const result = 'resource2 from dynamic2.wbn';
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource3.js b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource3.js
new file mode 100644
index 00000000000..0dad7ea7bf9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource3.js
@@ -0,0 +1 @@
+export const result = 'resource3 from dynamic2.wbn';
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource4.js b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource4.js
new file mode 100644
index 00000000000..e51cf7f5dc1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource4.js
@@ -0,0 +1 @@
+export const result = 'resource4 from dynamic2.wbn';
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/generate-test-wbns.sh b/tests/wpt/web-platform-tests/web-bundle/resources/generate-test-wbns.sh
index 820bb12267c..c3dd8ebc720 100755
--- a/tests/wpt/web-platform-tests/web-bundle/resources/generate-test-wbns.sh
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/generate-test-wbns.sh
@@ -10,11 +10,33 @@ fi
 
 # TODO: Stop hard-coding "web-platform.test" when generating Web Bundles on the
 # fly.
-wpt_test_origin=https://web-platform.test:8444
+wpt_test_https_origin=https://web-platform.test:8444
+wpt_test_http_origin=http://web-platform.test:8001
 
 gen-bundle \
   -version b1 \
-  -baseURL $wpt_test_origin/web-bundle/resources/wbn/ \
-  -primaryURL $wpt_test_origin/web-bundle/resources/wbn/location.html \
+  -baseURL $wpt_test_https_origin/web-bundle/resources/wbn/ \
+  -primaryURL $wpt_test_https_origin/web-bundle/resources/wbn/location.html \
   -dir location/ \
   -o wbn/location.wbn
+
+gen-bundle \
+  -version b1 \
+  -baseURL https://subresource-wbn.example/ \
+  -primaryURL https://subresource-wbn.example/root.js \
+  -dir subresource/ \
+  -o wbn/subresource.wbn
+
+gen-bundle \
+  -version b1 \
+  -baseURL $wpt_test_http_origin/web-bundle/resources/dynamic/ \
+  -primaryURL $wpt_test_http_origin/web-bundle/resources/dynamic/resource1.js \
+  -dir dynamic1/ \
+  -o wbn/dynamic1.wbn
+
+gen-bundle \
+  -version b1 \
+  -baseURL $wpt_test_http_origin/web-bundle/resources/dynamic/ \
+  -primaryURL $wpt_test_http_origin/web-bundle/resources/dynamic/resource1.js \
+  -dir dynamic2/ \
+  -o wbn/dynamic2.wbn
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/subresource/root.js b/tests/wpt/web-platform-tests/web-bundle/resources/subresource/root.js
new file mode 100644
index 00000000000..2c2a465472b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/subresource/root.js
@@ -0,0 +1 @@
+export * from './submodule.js';
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/subresource/submodule.js b/tests/wpt/web-platform-tests/web-bundle/resources/subresource/submodule.js
new file mode 100644
index 00000000000..4561aaf014f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/subresource/submodule.js
@@ -0,0 +1 @@
+export const result = 'OK';
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1.wbn
new file mode 100644
index 0000000000000000000000000000000000000000..22db19e7ce14d40cc4ba87d120486c24da1a4070
GIT binary patch
literal 1201
zcmdUtzfZzI6vu%$`4_-oavO`Ky(=}QL__=$h_OyaSg-8?N7}nf?^R)N0pjFf;vc}G
z?*0S#FR{AWpcn@y)0pta_g=p5lf2JedpW;<Sk50`PJCP_j9LQ#<(lRV^9>bI=*c9m
z0n^~_TNYlm{ZxbzGZUs|ngmRn;aJd^2j3lB8|u!CaS^gnrFh7*O(lh9x>9<dJmq#`
z+ANkAxulT{c-kz#<rHVH;wr`4obu|Qd8I~qF`IN}&n;I2g;XCC%Q_FF04BhIv0_(L
zsfY&@xD@7)UQ-<;T!BY}fGIE%D*8;H`s3`MUPLt*u?%^Sv#`74NwJHtjn2{t5sO&J
za$HPYTt_YM@?w1?VxkX&BggJKY@}oYD4S?N*@x2z&;hEht-z?4$QXU8fonIus5Z7Y
kg`R9Qz5TEB9TsNhI6ut6F4=Pl`J*}YU+LS0Rc*a~0MKQvlmGw#

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic2.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic2.wbn
new file mode 100644
index 0000000000000000000000000000000000000000..44c4b1ee86662af2b474447335267cf7b274e62b
GIT binary patch
literal 1201
zcmdUtzfZzI6vu%$`4_-oavO`Ky(=}QL__=$h_OyaSg-8?N7}nf?^R)N0pjFf;vc}G
z?*0S#FR{AWpcn@y)0pta_g=p5lf2JedpW;<Sk50`PJCP_j9LQ#<(lRV^9>bI=*c9m
z0n^~_TNYlm{ZxbzGZUs|ngmRn;aJd^2j3lB8|u!CaS^gnrFh7*O(lh9x>9<dJmq#`
z+ANkAxulT{c-kz#<rHVH;wr`4obu|Qd8I~qF`IN}&n;I2g;XCC%Q_FF04BhIv0_(L
zsfY&@xD@7)UQ-<;T!BY}fGIE%D*8;H`s3`MUPLt*u?%^Sv#`74NwJHtjn2{t5sO&J
za$HPYTt_YM@?w1?VxkX&BggJKY@}oYD4S?N*@x2z&;hEht-z?4$QXU8L25U?s5Z7Y
kg`R9Qz5TEB9TsNhI6ut6F4=Q!`;X?-f2D61R<-r|0oBZ{ng9R*

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/subresource.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/subresource.wbn
new file mode 100644
index 0000000000000000000000000000000000000000..395039dc216250729ed75bdab2c10a7f16998f16
GIT binary patch
literal 523
zcmchU&q~8U5Qkfj`T`LY_7;$)Nw*>r5sH6kQDZMsbKPvF?Ur<R*_~*5ZHp%lf)7v-
zD(KVo5sadq1U)(D;rD$rzq`(AasRMdJU*W!jY_3(hltvSzHjryfK|ES;N2#&4h0+Q
z41A*$)<?EC2O(1^94^W=t)vCJS?x}r{+uvtRh^fj_8YJC7^^hTpoGp^&a1PWPUHEq
z9a?0V+hZC87hFjMi5^Zg^qAI};0%S5{)pW$%Z<<&G0s7wXP6v-JxwMEHp-YquS^$x
z0cpH_4QY+gU2>L7LIWC*U@vUau+bpx=<4zdl7SrH@Tf^+0)<uv$qwloH70KT{b}E_
m?!o#$iw5*3QMw;*eTtSRSR`d%d4}YWxZU$ovQzn(wT(Aj!@8&d

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-from-web-bundle.tentative.html b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-from-web-bundle.tentative.html
new file mode 100644
index 00000000000..e35264698db
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-from-web-bundle.tentative.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<title>Subresource loading with link rel="webbundle"</title>
+<link
+  rel="help"
+  href="https://github.com/WICG/webpackage/blob/master/explainers/subresource-loading.md"
+/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+  <link rel="webbundle" href="../resources/wbn/subresource.wbn"
+        resources="https://subresource-wbn.example/root.js https://subresource-wbn.example/submodule.js" />
+  <script>
+    promise_test(async () => {
+      const module = await import('https://subresource-wbn.example/root.js');
+      assert_equals(module.result, 'OK');
+    }, "Subresource loading with WebBundle");
+
+    promise_test(async () => {
+      const link = document.createElement("link");
+      link.rel = "webbundle";
+      link.href = "../resources/wbn/dynamic1.wbn";
+      link.resources.add('http://web-platform.test:8001/web-bundle/resources/dynamic/resource1.js',
+                         'http://web-platform.test:8001/web-bundle/resources/dynamic/resource2.js',
+                         'http://web-platform.test:8001/web-bundle/resources/dynamic/resource4.js');
+      document.body.appendChild(link);
+
+      const module = await import('http://web-platform.test:8001/web-bundle/resources/dynamic/resource1.js');
+      assert_equals(module.result, 'resource1 from dynamic1.wbn');
+
+      link.href = "../resources/wbn/dynamic2.wbn";
+      const module2 = await import('http://web-platform.test:8001/web-bundle/resources/dynamic/resource2.js');
+      assert_equals(module2.result, 'resource2 from dynamic2.wbn');
+
+      // A resource not specified in the resources attribute, but in the bundle.
+      const module3 = await import('http://web-platform.test:8001/web-bundle/resources/dynamic/resource3.js');
+      assert_equals(module3.result, 'resource3 from network');
+
+      document.body.removeChild(link);
+      const module4 = await import('http://web-platform.test:8001/web-bundle/resources/dynamic/resource4.js');
+      assert_equals(module4.result, 'resource4 from network');
+    }, 'Dynamically adding / updating / removing "<link rel=webbundle>"');
+
+    promise_test(() => {
+      return new Promise((resolve, reject) => {
+        const link = document.createElement("link");
+        link.rel = "webbundle";
+        link.href = "../resources/wbn/dynamic1.wbn?test-event";
+        link.onload = resolve;
+        link.onerror = reject;
+        document.body.appendChild(link);
+      });
+    }, '<link rel="webbundle"> fires a load event on load success');
+
+    promise_test(() => {
+      return new Promise((resolve, reject) => {
+        const link = document.createElement("link");
+        link.rel = "webbundle";
+        link.href = "../resources/wbn/nonexistent.wbn";
+        link.onload = reject;
+        link.onerror = resolve;
+        document.body.appendChild(link);
+      });
+    }, '<link rel="webbundle"> fires an error event on load failure');
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/web-share/share-consume-activation.https.html b/tests/wpt/web-platform-tests/web-share/share-consume-activation.https.html
index ba14117c1d9..4b4ecd560c6 100644
--- a/tests/wpt/web-platform-tests/web-share/share-consume-activation.https.html
+++ b/tests/wpt/web-platform-tests/web-share/share-consume-activation.https.html
@@ -6,8 +6,8 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="resources/manual-helper.js"></script>
-    <script src="/resources/testdriver-vendor.js"></script>
     <script src="/resources/testdriver.js"></script>
+    <script src="/resources/testdriver-vendor.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/web-share/share-empty.https.html b/tests/wpt/web-platform-tests/web-share/share-empty.https.html
index d0e0241ae44..c8fbb8ad451 100644
--- a/tests/wpt/web-platform-tests/web-share/share-empty.https.html
+++ b/tests/wpt/web-platform-tests/web-share/share-empty.https.html
@@ -6,8 +6,8 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="resources/manual-helper.js"></script>
-    <script src="/resources/testdriver-vendor.js"></script>
     <script src="/resources/testdriver.js"></script>
+    <script src="/resources/testdriver-vendor.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/web-share/share-files-manual.tentative.https.html b/tests/wpt/web-platform-tests/web-share/share-files-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/web-share/share-files-manual.tentative.https.html
rename to tests/wpt/web-platform-tests/web-share/share-files-manual.https.html
diff --git a/tests/wpt/web-platform-tests/web-share/share-url-invalid.https.html b/tests/wpt/web-platform-tests/web-share/share-url-invalid.https.html
index e4af03d4c88..5eae8e89426 100644
--- a/tests/wpt/web-platform-tests/web-share/share-url-invalid.https.html
+++ b/tests/wpt/web-platform-tests/web-share/share-url-invalid.https.html
@@ -5,8 +5,8 @@
     <title>WebShare Test: Share with an invalid URL</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/resources/testdriver-vendor.js"></script>
     <script src="/resources/testdriver.js"></script>
+    <script src="/resources/testdriver-vendor.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/html/deleteframe.html b/tests/wpt/web-platform-tests/webdriver/tests/support/html/deleteframe.html
new file mode 100644
index 00000000000..e0063fd1b0f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/support/html/deleteframe.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+  <input type="button" id="killIframe" onclick="top.remove();" value="Remove frame" />
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/html/frames.html b/tests/wpt/web-platform-tests/webdriver/tests/support/html/frames.html
new file mode 100644
index 00000000000..2019485529f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/support/html/frames.html
@@ -0,0 +1,16 @@
+<html>
+<head>
+  <script type="text/javascript">
+    function remove() {
+      const frame = document.getElementById("delete-frame");
+      const div = document.getElementById("delete");
+      div.removeChild(frame);
+    }
+  </script>
+</head>
+<body>
+  <div id="delete">
+    <iframe src="deleteframe.html" id="delete-frame"></iframe>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch.py b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch.py
index f9b0e6fc1fc..723c48c3e85 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch.py
@@ -2,7 +2,7 @@ import pytest
 
 import webdriver.protocol as protocol
 
-from webdriver import StaleElementReferenceException
+from webdriver import NoSuchElementException, StaleElementReferenceException
 from webdriver.transport import Response
 
 from tests.support.asserts import assert_error, assert_same_element, assert_success
@@ -43,12 +43,6 @@ def test_frame_id_invalid_types(session, value):
     assert_error(response, "invalid argument")
 
 
-@pytest.mark.parametrize("value", [-1, 2**16])
-def test_frame_id_out_of_bounds(session, value):
-    response = switch_to_frame(session, value)
-    assert_error(response, "invalid argument")
-
-
 def test_no_browsing_context(session, closed_window):
     response = switch_to_frame(session, 1)
     assert_error(response, "no such window")
@@ -59,91 +53,39 @@ def test_frame_id_null(session):
 
     frame1 = session.find.css("iframe", all=False)
     session.switch_frame(frame1)
-    frame1_element = session.find.css("div", all=False)
+    element1 = session.find.css("div", all=False)
 
     frame2 = session.find.css("iframe", all=False)
     session.switch_frame(frame2)
-    frame2_element = session.find.css("p", all=False)
+    element2 = session.find.css("p", all=False)
 
     # Switch to top-level browsing context
     response = switch_to_frame(session, None)
     assert_success(response)
 
     with pytest.raises(StaleElementReferenceException):
-        frame2_element.text
+        element2.text
     with pytest.raises(StaleElementReferenceException):
-        frame1_element.text
+        element1.text
 
     frame = session.find.css("iframe", all=False)
     assert_same_element(session, frame, frame1)
 
 
-@pytest.mark.parametrize("index, value", [[0, "foo"], [1, "bar"]])
-def test_frame_id_number_index(session, index, value):
-    session.url = inline("{}{}".format(iframe("<p>foo"), iframe("<p>bar")))
-
-    response = switch_to_frame(session, index)
-    assert_success(response)
-
-    frame_element = session.find.css("p", all=False)
-    assert frame_element.text == value
-
-
-def test_frame_id_number_index_out_of_bounds(session):
-    session.url = inline(iframe("<p>foo"))
-
-    response = switch_to_frame(session, 1)
-    assert_error(response, "no such frame")
-
-
-@pytest.mark.parametrize("index, value", [[0, "foo"], [1, "bar"]])
-def test_frame_id_webelement_frame(session, index, value):
-    session.url = inline(frameset("<p>foo", "<p>bar"))
-    frames = session.find.css("frame")
-    assert len(frames) == 2
-
-    response = switch_to_frame(session, frames[index])
-    assert_success(response)
-
-    frame_element = session.find.css("p", all=False)
-    assert frame_element.text == value
-
-
-@pytest.mark.parametrize("index, value", [[0, "foo"], [1, "bar"]])
-def test_frame_id_webelement_iframe(session, index, value):
-    session.url = inline("{}{}".format(iframe("<p>foo"), iframe("<p>bar")))
-    frames = session.find.css("iframe")
-    assert len(frames) == 2
-
-    response = switch_to_frame(session, frames[index])
-    assert_success(response)
-
-    frame_element = session.find.css("p", all=False)
-    assert frame_element.text == value
-
-
-def test_frame_id_webelement_no_element_reference(session):
-    session.url = inline(iframe("<p>foo"))
-    frame = session.find.css("iframe", all=False)
-    frame.id = "bar"
-
-    response = switch_to_frame(session, frame)
-    assert_error(response, "no such element")
-
-
-def test_frame_id_webelement_stale_reference(session):
-    session.url = inline(iframe("<p>foo"))
+def test_frame_deleted(session, url):
+    session.url = url("/webdriver/tests/support/html/frames.html")
     frame = session.find.css("iframe", all=False)
 
-    session.switch_frame(frame)
-
     response = switch_to_frame(session, frame)
-    assert_error(response, "stale element reference")
+    assert_success(response)
 
+    input = session.find.css("input", all=False)
+    input.click()
 
-def test_frame_id_webelement_no_frame_element(session):
-    session.url = inline("<p>foo")
-    no_frame = session.find.css("p", all=False)
+    response = switch_to_frame(session, None)
+    assert_success(response)
 
-    response = switch_to_frame(session, no_frame)
-    assert_error(response, "no such frame")
+    with pytest.raises(NoSuchElementException):
+        session.find.css("iframe", all=False)
+
+    session.find.css("#delete", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch_number.py b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch_number.py
new file mode 100644
index 00000000000..77529544679
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch_number.py
@@ -0,0 +1,51 @@
+import pytest
+
+import webdriver.protocol as protocol
+
+from tests.support.asserts import assert_error, assert_success
+from tests.support.inline import inline, iframe
+
+
+def switch_to_frame(session, frame):
+    return session.transport.send(
+        "POST", "session/{session_id}/frame".format(**vars(session)),
+        {"id": frame},
+        encoder=protocol.Encoder, decoder=protocol.Decoder,
+        session=session)
+
+
+@pytest.mark.parametrize("value", [-1, 2**16])
+def test_frame_id_number_out_of_bounds(session, value):
+    response = switch_to_frame(session, value)
+    assert_error(response, "invalid argument")
+
+
+@pytest.mark.parametrize("index", [1, 65535])
+def test_frame_id_number_index_out_of_bounds(session, index):
+    session.url = inline(iframe("<p>foo"))
+
+    response = switch_to_frame(session, index)
+    assert_error(response, "no such frame")
+
+
+@pytest.mark.parametrize("index, value", [[0, "foo"], [1, "bar"]])
+def test_frame_id_number_index(session, index, value):
+    session.url = inline("{}{}".format(iframe("<p>foo"), iframe("<p>bar")))
+
+    response = switch_to_frame(session, index)
+    assert_success(response)
+
+    element = session.find.css("p", all=False)
+    assert element.text == value
+
+
+def test_frame_id_number_index_nested(session):
+    session.url = inline(iframe("{}<p>foo".format(iframe("<p>bar"))))
+
+    expected_text = ["foo", "bar"]
+    for i in range(0, len(expected_text)):
+        response = switch_to_frame(session, 0)
+        assert_success(response)
+
+        element = session.find.css("p", all=False)
+        assert element.text == expected_text[i]
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch_webelement.py b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch_webelement.py
new file mode 100644
index 00000000000..89480b66b3a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch_webelement.py
@@ -0,0 +1,85 @@
+import pytest
+
+import webdriver.protocol as protocol
+
+from tests.support.asserts import assert_error, assert_success
+from tests.support.inline import inline, iframe
+
+
+def switch_to_frame(session, frame):
+    return session.transport.send(
+        "POST", "session/{session_id}/frame".format(**vars(session)),
+        {"id": frame},
+        encoder=protocol.Encoder, decoder=protocol.Decoder,
+        session=session)
+
+
+def frameset(*docs):
+    frames = list(map(lambda doc: "<frame src='{}'></frame>".format(inline(doc)), docs))
+    return "<frameset rows='{}'>\n{}</frameset>".format(len(frames) * "*,", "\n".join(frames))
+
+
+@pytest.mark.parametrize("index, value", [[0, "foo"], [1, "bar"]])
+def test_frame_id_webelement_frame(session, index, value):
+    session.url = inline(frameset("<p>foo", "<p>bar"))
+    frames = session.find.css("frame")
+    assert len(frames) == 2
+
+    response = switch_to_frame(session, frames[index])
+    assert_success(response)
+
+    element = session.find.css("p", all=False)
+    assert element.text == value
+
+
+@pytest.mark.parametrize("index, value", [[0, "foo"], [1, "bar"]])
+def test_frame_id_webelement_iframe(session, index, value):
+    session.url = inline("{}{}".format(iframe("<p>foo"), iframe("<p>bar")))
+    frames = session.find.css("iframe")
+    assert len(frames) == 2
+
+    response = switch_to_frame(session, frames[index])
+    assert_success(response)
+
+    element = session.find.css("p", all=False)
+    assert element.text == value
+
+
+def test_frame_id_webelement_nested(session):
+    session.url = inline(iframe("{}<p>foo".format(iframe("<p>bar"))))
+
+    expected_text = ["foo", "bar"]
+    for i in range(0, len(expected_text)):
+        frame_element = session.find.css("iframe", all=False)
+        response = switch_to_frame(session, frame_element)
+        assert_success(response)
+
+        element = session.find.css("p", all=False)
+        assert element.text == expected_text[i]
+
+
+def test_frame_id_webelement_no_element_reference(session):
+    session.url = inline(iframe("<p>foo"))
+    frame = session.find.css("iframe", all=False)
+    frame.id = "bar"
+
+    response = switch_to_frame(session, frame)
+    assert_error(response, "no such element")
+
+
+def test_frame_id_webelement_stale_reference(session):
+    session.url = inline(iframe("<p>foo"))
+    frame = session.find.css("iframe", all=False)
+
+    session.refresh()
+
+    response = switch_to_frame(session, frame)
+    assert_error(response, "stale element reference")
+
+
+def test_frame_id_webelement_no_frame_element(session):
+    session.url = inline("<p>foo")
+    no_frame = session.find.css("p", all=False)
+
+    response = switch_to_frame(session, no_frame)
+    assert_error(response, "no such frame")