From 0edab51f05fe4749075d35393e87d24ddbd23842 Mon Sep 17 00:00:00 2001
From: "Ying-Ruei Liang(KK)" <thumbd03803@gmail.com>
Date: Wed, 12 Oct 2016 15:14:06 +0800
Subject: [PATCH] Clean and fix referrer policy wpt for a-tag

Signed-off-by: Ying-Ruei Liang(KK) <thumbd03803@gmail.com>
---
 .../2d.imageData.object.ctor.html.ini         |    1 +
 .../form-control-infrastructure/form.html.ini |    1 +
 .../label-attributes.html.ini                 |    1 +
 tests/wpt/mozilla/meta/MANIFEST.json          | 1031 +++++++++--------
 ...generic.keep-origin-redirect.http.html.ini |    5 +
 .../a-tag/generic.no-redirect.http.html.ini   |    5 +
 ...generic.swap-origin-redirect.http.html.ini |    5 +
 ...generic.keep-origin-redirect.http.html.ini |    5 +
 .../a-tag/generic.no-redirect.http.html.ini   |    5 +
 ...generic.swap-origin-redirect.http.html.ini |    5 +
 ...generic.keep-origin-redirect.http.html.ini |    5 +
 .../a-tag/generic.no-redirect.http.html.ini   |    5 +
 ...generic.swap-origin-redirect.http.html.ini |    5 +
 ...generic.keep-origin-redirect.http.html.ini |    5 +
 .../a-tag/generic.no-redirect.http.html.ini   |    5 +
 ...generic.swap-origin-redirect.http.html.ini |    5 +
 ...generic.keep-origin-redirect.http.html.ini |    5 -
 .../a-tag/generic.no-redirect.http.html.ini   |    5 -
 ...generic.swap-origin-redirect.http.html.ini |    5 -
 ...generic.keep-origin-redirect.http.html.ini |    5 -
 .../a-tag/generic.no-redirect.http.html.ini   |    5 -
 ...generic.swap-origin-redirect.http.html.ini |    5 -
 ...-origin.keep-origin-redirect.http.html.ini |    5 +
 .../cross-origin.no-redirect.http.html.ini    |    5 +
 ...-origin.swap-origin-redirect.http.html.ini |    5 +
 ...nsecure.swap-origin-redirect.http.html.ini |    5 +
 ...-origin.keep-origin-redirect.http.html.ini |    5 +
 .../cross-origin.no-redirect.http.html.ini    |    5 +
 ...-origin.swap-origin-redirect.http.html.ini |    5 +
 ...nsecure.swap-origin-redirect.http.html.ini |    5 +
 ...generic.keep-origin-redirect.http.html.ini |    5 +
 .../a-tag/generic.no-redirect.http.html.ini   |    5 +
 ...generic.swap-origin-redirect.http.html.ini |    5 +
 ...generic.keep-origin-redirect.http.html.ini |    5 +
 .../a-tag/generic.no-redirect.http.html.ini   |    5 +
 ...generic.swap-origin-redirect.http.html.ini |    5 +
 ...generic.keep-origin-redirect.http.html.ini |    5 +
 .../a-tag/generic.no-redirect.http.html.ini   |    5 +
 ...generic.swap-origin-redirect.http.html.ini |    5 +
 ...generic.keep-origin-redirect.http.html.ini |    5 +
 .../a-tag/generic.no-redirect.http.html.ini   |    5 +
 ...generic.swap-origin-redirect.http.html.ini |    5 +
 ...-origin.keep-origin-redirect.http.html.ini |    5 +
 .../cross-origin.no-redirect.http.html.ini    |    5 +
 ...-origin.swap-origin-redirect.http.html.ini |    5 +
 ...nsecure.swap-origin-redirect.http.html.ini |    5 +
 ...-origin.keep-origin-redirect.http.html.ini |    5 +
 .../cross-origin.no-redirect.http.html.ini    |    5 +
 ...-origin.swap-origin-redirect.http.html.ini |    5 +
 ...nsecure.swap-origin-redirect.http.html.ini |    5 +
 .../mozilla/referrer-policy/generic/common.js |   60 +-
 .../generic/referrer-policy-test-case.js      |   25 +-
 .../generic/subresource/a-tag.html            |   51 +-
 .../generic/subresource/a-tag.py              |   22 +
 .../generic/subresource/mozresource.py        |   10 +-
 .../referrer-policy/generic/tools/generate.py |    3 +-
 ...re-protocol.keep-origin-redirect.http.html |    2 +-
 .../insecure-protocol.no-redirect.http.html   |    2 +-
 ...re-protocol.swap-origin-redirect.http.html |    2 +-
 ...de-protocol.keep-origin-redirect.http.html |    2 +-
 .../upgrade-protocol.no-redirect.http.html    |    2 +-
 ...de-protocol.swap-origin-redirect.http.html |    2 +-
 ...re-protocol.keep-origin-redirect.http.html |    2 +-
 .../insecure-protocol.no-redirect.http.html   |    2 +-
 ...re-protocol.swap-origin-redirect.http.html |    2 +-
 ...de-protocol.keep-origin-redirect.http.html |    2 +-
 .../upgrade-protocol.no-redirect.http.html    |    2 +-
 ...de-protocol.swap-origin-redirect.http.html |    2 +-
 ...re-protocol.keep-origin-redirect.http.html |    4 +-
 .../insecure-protocol.no-redirect.http.html   |    4 +-
 ...re-protocol.swap-origin-redirect.http.html |    4 +-
 ...re-protocol.keep-origin-redirect.http.html |    2 +-
 .../insecure-protocol.no-redirect.http.html   |    2 +-
 ...re-protocol.swap-origin-redirect.http.html |    2 +-
 ...re-protocol.keep-origin-redirect.http.html |    2 +-
 .../insecure-protocol.no-redirect.http.html   |    2 +-
 ...re-protocol.swap-origin-redirect.http.html |    2 +-
 ...de-protocol.keep-origin-redirect.http.html |    4 +-
 .../upgrade-protocol.no-redirect.http.html    |    4 +-
 ...de-protocol.swap-origin-redirect.http.html |    4 +-
 ...de-protocol.keep-origin-redirect.http.html |    2 +-
 .../upgrade-protocol.no-redirect.http.html    |    2 +-
 ...de-protocol.swap-origin-redirect.http.html |    2 +-
 ...de-protocol.keep-origin-redirect.http.html |    2 +-
 .../upgrade-protocol.no-redirect.http.html    |    2 +-
 ...de-protocol.swap-origin-redirect.http.html |    2 +-
 ...re-protocol.keep-origin-redirect.http.html |    4 +-
 .../insecure-protocol.no-redirect.http.html   |    4 +-
 ...re-protocol.swap-origin-redirect.http.html |    4 +-
 ...re-protocol.keep-origin-redirect.http.html |    2 +-
 .../insecure-protocol.no-redirect.http.html   |    2 +-
 ...re-protocol.swap-origin-redirect.http.html |    2 +-
 ...re-protocol.keep-origin-redirect.http.html |    2 +-
 .../insecure-protocol.no-redirect.http.html   |    2 +-
 ...re-protocol.swap-origin-redirect.http.html |    2 +-
 ...de-protocol.keep-origin-redirect.http.html |    4 +-
 .../upgrade-protocol.no-redirect.http.html    |    4 +-
 ...de-protocol.swap-origin-redirect.http.html |    4 +-
 ...de-protocol.keep-origin-redirect.http.html |    2 +-
 .../upgrade-protocol.no-redirect.http.html    |    2 +-
 ...de-protocol.swap-origin-redirect.http.html |    2 +-
 ...de-protocol.keep-origin-redirect.http.html |    2 +-
 .../upgrade-protocol.no-redirect.http.html    |    2 +-
 ...de-protocol.swap-origin-redirect.http.html |    2 +-
 ...re-protocol.keep-origin-redirect.http.html |    2 +-
 .../insecure-protocol.no-redirect.http.html   |    2 +-
 ...re-protocol.swap-origin-redirect.http.html |    2 +-
 ...de-protocol.keep-origin-redirect.http.html |    2 +-
 .../upgrade-protocol.no-redirect.http.html    |    2 +-
 ...de-protocol.swap-origin-redirect.http.html |    2 +-
 ...re-protocol.keep-origin-redirect.http.html |    2 +-
 .../insecure-protocol.no-redirect.http.html   |    2 +-
 ...re-protocol.swap-origin-redirect.http.html |    2 +-
 ...de-protocol.keep-origin-redirect.http.html |    2 +-
 .../upgrade-protocol.no-redirect.http.html    |    2 +-
 ...de-protocol.swap-origin-redirect.http.html |    2 +-
 ...re-protocol.keep-origin-redirect.http.html |    2 +-
 .../insecure-protocol.no-redirect.http.html   |    2 +-
 ...re-protocol.swap-origin-redirect.http.html |    2 +-
 ...de-protocol.keep-origin-redirect.http.html |    2 +-
 .../upgrade-protocol.no-redirect.http.html    |    2 +-
 ...de-protocol.swap-origin-redirect.http.html |    2 +-
 ...re-protocol.keep-origin-redirect.http.html |    2 +-
 .../insecure-protocol.no-redirect.http.html   |    2 +-
 ...re-protocol.swap-origin-redirect.http.html |    2 +-
 ...de-protocol.keep-origin-redirect.http.html |    2 +-
 .../upgrade-protocol.no-redirect.http.html    |    2 +-
 ...de-protocol.swap-origin-redirect.http.html |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    4 +-
 .../a-tag/generic.no-redirect.http.html       |    4 +-
 .../generic.swap-origin-redirect.http.html    |    4 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../iframe-tag/generic.no-redirect.http.html  |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../link-tag/generic.no-redirect.http.html    |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    4 +-
 .../a-tag/generic.no-redirect.http.html       |    4 +-
 .../generic.swap-origin-redirect.http.html    |    4 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../iframe-tag/generic.no-redirect.http.html  |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../link-tag/generic.no-redirect.http.html    |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    4 +-
 .../a-tag/generic.no-redirect.http.html       |    4 +-
 .../generic.swap-origin-redirect.http.html    |    4 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../iframe-tag/generic.no-redirect.http.html  |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../link-tag/generic.no-redirect.http.html    |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    4 +-
 .../a-tag/generic.no-redirect.http.html       |    4 +-
 .../generic.swap-origin-redirect.http.html    |    4 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../iframe-tag/generic.no-redirect.http.html  |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../link-tag/generic.no-redirect.http.html    |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../a-tag/cross-origin.no-redirect.http.html  |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../a-tag/cross-origin.no-redirect.http.html  |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.keep-origin-redirect.http.html |    2 +-
 ...same-origin-insecure.no-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...n-downgrade.keep-origin-redirect.http.html |    2 +-
 ...ame-origin-downgrade.no-redirect.http.html |    2 +-
 ...n-downgrade.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...gin-upgrade.keep-origin-redirect.http.html |    2 +-
 .../same-origin-upgrade.no-redirect.http.html |    2 +-
 ...gin-upgrade.swap-origin-redirect.http.html |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    4 +-
 .../a-tag/cross-origin.no-redirect.http.html  |    4 +-
 ...ross-origin.swap-origin-redirect.http.html |    4 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../cross-origin.no-redirect.http.html        |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../cross-origin.no-redirect.http.html        |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    4 +-
 .../a-tag/cross-origin.no-redirect.http.html  |    4 +-
 ...ross-origin.swap-origin-redirect.http.html |    4 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../cross-origin.no-redirect.http.html        |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../cross-origin.no-redirect.http.html        |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.keep-origin-redirect.http.html |    4 +-
 ...same-origin-insecure.no-redirect.http.html |    4 +-
 ...in-insecure.swap-origin-redirect.http.html |    4 +-
 ...in-insecure.keep-origin-redirect.http.html |    2 +-
 ...same-origin-insecure.no-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.keep-origin-redirect.http.html |    2 +-
 ...same-origin-insecure.no-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...n-downgrade.keep-origin-redirect.http.html |    4 +-
 ...ame-origin-downgrade.no-redirect.http.html |    4 +-
 ...n-downgrade.swap-origin-redirect.http.html |    4 +-
 ...in-insecure.swap-origin-redirect.http.html |    4 +-
 ...gin-upgrade.keep-origin-redirect.http.html |    4 +-
 .../same-origin-upgrade.no-redirect.http.html |    4 +-
 ...gin-upgrade.swap-origin-redirect.http.html |    4 +-
 ...n-downgrade.keep-origin-redirect.http.html |    2 +-
 ...ame-origin-downgrade.no-redirect.http.html |    2 +-
 ...n-downgrade.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...gin-upgrade.keep-origin-redirect.http.html |    2 +-
 .../same-origin-upgrade.no-redirect.http.html |    2 +-
 ...gin-upgrade.swap-origin-redirect.http.html |    2 +-
 ...n-downgrade.keep-origin-redirect.http.html |    2 +-
 ...ame-origin-downgrade.no-redirect.http.html |    2 +-
 ...n-downgrade.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...gin-upgrade.keep-origin-redirect.http.html |    2 +-
 .../same-origin-upgrade.no-redirect.http.html |    2 +-
 ...gin-upgrade.swap-origin-redirect.http.html |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../a-tag/cross-origin.no-redirect.http.html  |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../a-tag/cross-origin.no-redirect.http.html  |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.keep-origin-redirect.http.html |    2 +-
 ...same-origin-insecure.no-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...n-downgrade.keep-origin-redirect.http.html |    2 +-
 ...ame-origin-downgrade.no-redirect.http.html |    2 +-
 ...n-downgrade.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...gin-upgrade.keep-origin-redirect.http.html |    2 +-
 .../same-origin-upgrade.no-redirect.http.html |    2 +-
 ...gin-upgrade.swap-origin-redirect.http.html |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../a-tag/cross-origin.no-redirect.http.html  |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../a-tag/cross-origin.no-redirect.http.html  |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.keep-origin-redirect.http.html |    2 +-
 ...same-origin-insecure.no-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...n-downgrade.keep-origin-redirect.http.html |    2 +-
 ...ame-origin-downgrade.no-redirect.http.html |    2 +-
 ...n-downgrade.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...gin-upgrade.keep-origin-redirect.http.html |    2 +-
 .../same-origin-upgrade.no-redirect.http.html |    2 +-
 ...gin-upgrade.swap-origin-redirect.http.html |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    4 +-
 .../a-tag/generic.no-redirect.http.html       |    4 +-
 .../generic.swap-origin-redirect.http.html    |    4 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../iframe-tag/generic.no-redirect.http.html  |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../link-tag/generic.no-redirect.http.html    |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    4 +-
 .../a-tag/generic.no-redirect.http.html       |    4 +-
 .../generic.swap-origin-redirect.http.html    |    4 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../iframe-tag/generic.no-redirect.http.html  |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../link-tag/generic.no-redirect.http.html    |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    4 +-
 .../a-tag/generic.no-redirect.http.html       |    4 +-
 .../generic.swap-origin-redirect.http.html    |    4 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../iframe-tag/generic.no-redirect.http.html  |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../link-tag/generic.no-redirect.http.html    |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    4 +-
 .../a-tag/generic.no-redirect.http.html       |    4 +-
 .../generic.swap-origin-redirect.http.html    |    4 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../iframe-tag/generic.no-redirect.http.html  |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../link-tag/generic.no-redirect.http.html    |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../a-tag/cross-origin.no-redirect.http.html  |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../a-tag/cross-origin.no-redirect.http.html  |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.keep-origin-redirect.http.html |    2 +-
 ...same-origin-insecure.no-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    4 +-
 .../a-tag/cross-origin.no-redirect.http.html  |    4 +-
 ...ross-origin.swap-origin-redirect.http.html |    4 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../cross-origin.no-redirect.http.html        |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../cross-origin.no-redirect.http.html        |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    4 +-
 .../a-tag/cross-origin.no-redirect.http.html  |    4 +-
 ...ross-origin.swap-origin-redirect.http.html |    4 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../cross-origin.no-redirect.http.html        |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../cross-origin.no-redirect.http.html        |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.keep-origin-redirect.http.html |    4 +-
 ...same-origin-insecure.no-redirect.http.html |    4 +-
 ...in-insecure.swap-origin-redirect.http.html |    4 +-
 ...in-insecure.keep-origin-redirect.http.html |    2 +-
 ...same-origin-insecure.no-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.keep-origin-redirect.http.html |    2 +-
 ...same-origin-insecure.no-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    4 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../a-tag/cross-origin.no-redirect.http.html  |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../a-tag/cross-origin.no-redirect.http.html  |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.keep-origin-redirect.http.html |    2 +-
 ...same-origin-insecure.no-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../a-tag/cross-origin.no-redirect.http.html  |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...ross-origin.keep-origin-redirect.http.html |    2 +-
 .../a-tag/cross-origin.no-redirect.http.html  |    2 +-
 ...ross-origin.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.keep-origin-redirect.http.html |    2 +-
 ...same-origin-insecure.no-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 ...in-insecure.swap-origin-redirect.http.html |    2 +-
 .../mozilla/referrer-policy/spec.src.json     |    2 +-
 .../mozilla/referrer-policy/spec_json.js      |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    4 +-
 .../a-tag/generic.no-redirect.http.html       |    4 +-
 .../generic.swap-origin-redirect.http.html    |    4 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../iframe-tag/generic.no-redirect.http.html  |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../link-tag/generic.no-redirect.http.html    |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    4 +-
 .../a-tag/generic.no-redirect.http.html       |    4 +-
 .../generic.swap-origin-redirect.http.html    |    4 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../iframe-tag/generic.no-redirect.http.html  |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../link-tag/generic.no-redirect.http.html    |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    4 +-
 .../a-tag/generic.no-redirect.http.html       |    4 +-
 .../generic.swap-origin-redirect.http.html    |    4 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../iframe-tag/generic.no-redirect.http.html  |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../link-tag/generic.no-redirect.http.html    |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    4 +-
 .../a-tag/generic.no-redirect.http.html       |    4 +-
 .../generic.swap-origin-redirect.http.html    |    4 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../iframe-tag/generic.no-redirect.http.html  |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../link-tag/generic.no-redirect.http.html    |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 .../generic.keep-origin-redirect.http.html    |    2 +-
 .../a-tag/generic.no-redirect.http.html       |    2 +-
 .../generic.swap-origin-redirect.http.html    |    2 +-
 ...re-protocol.keep-origin-redirect.http.html |    2 +-
 .../insecure-protocol.no-redirect.http.html   |    2 +-
 ...re-protocol.swap-origin-redirect.http.html |    2 +-
 ...de-protocol.keep-origin-redirect.http.html |    2 +-
 .../upgrade-protocol.no-redirect.http.html    |    2 +-
 ...de-protocol.swap-origin-redirect.http.html |    2 +-
 ...re-protocol.keep-origin-redirect.http.html |    2 +-
 .../insecure-protocol.no-redirect.http.html   |    2 +-
 ...re-protocol.swap-origin-redirect.http.html |    2 +-
 ...de-protocol.keep-origin-redirect.http.html |    2 +-
 .../upgrade-protocol.no-redirect.http.html    |    2 +-
 ...de-protocol.swap-origin-redirect.http.html |    2 +-
 ...re-protocol.keep-origin-redirect.http.html |    2 +-
 .../insecure-protocol.no-redirect.http.html   |    2 +-
 ...re-protocol.swap-origin-redirect.http.html |    2 +-
 ...de-protocol.keep-origin-redirect.http.html |    2 +-
 .../upgrade-protocol.no-redirect.http.html    |    2 +-
 ...de-protocol.swap-origin-redirect.http.html |    2 +-
 ...re-protocol.keep-origin-redirect.http.html |    2 +-
 .../insecure-protocol.no-redirect.http.html   |    2 +-
 ...re-protocol.swap-origin-redirect.http.html |    2 +-
 ...de-protocol.keep-origin-redirect.http.html |    2 +-
 .../upgrade-protocol.no-redirect.http.html    |    2 +-
 ...de-protocol.swap-origin-redirect.http.html |    2 +-
 ...re-protocol.keep-origin-redirect.http.html |    2 +-
 .../insecure-protocol.no-redirect.http.html   |    2 +-
 ...re-protocol.swap-origin-redirect.http.html |    2 +-
 ...de-protocol.keep-origin-redirect.http.html |    2 +-
 .../upgrade-protocol.no-redirect.http.html    |    2 +-
 ...de-protocol.swap-origin-redirect.http.html |    2 +-
 ...re-protocol.keep-origin-redirect.http.html |    2 +-
 .../insecure-protocol.no-redirect.http.html   |    2 +-
 ...re-protocol.swap-origin-redirect.http.html |    2 +-
 ...de-protocol.keep-origin-redirect.http.html |    2 +-
 .../upgrade-protocol.no-redirect.http.html    |    2 +-
 ...de-protocol.swap-origin-redirect.http.html |    2 +-
 ...re-protocol.keep-origin-redirect.http.html |    2 +-
 .../insecure-protocol.no-redirect.http.html   |    2 +-
 ...re-protocol.swap-origin-redirect.http.html |    2 +-
 ...de-protocol.keep-origin-redirect.http.html |    2 +-
 .../upgrade-protocol.no-redirect.http.html    |    2 +-
 ...de-protocol.swap-origin-redirect.http.html |    2 +-
 ...re-protocol.keep-origin-redirect.http.html |    2 +-
 .../insecure-protocol.no-redirect.http.html   |    2 +-
 ...re-protocol.swap-origin-redirect.http.html |    2 +-
 ...de-protocol.keep-origin-redirect.http.html |    2 +-
 .../upgrade-protocol.no-redirect.http.html    |    2 +-
 ...de-protocol.swap-origin-redirect.http.html |    2 +-
 562 files changed, 1436 insertions(+), 1159 deletions(-)
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/a-tag.py

diff --git a/tests/wpt/metadata/2dcontext/pixel-manipulation/2d.imageData.object.ctor.html.ini b/tests/wpt/metadata/2dcontext/pixel-manipulation/2d.imageData.object.ctor.html.ini
index 2a649b8ab43..b4f5a874417 100644
--- a/tests/wpt/metadata/2dcontext/pixel-manipulation/2d.imageData.object.ctor.html.ini
+++ b/tests/wpt/metadata/2dcontext/pixel-manipulation/2d.imageData.object.ctor.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [ImageData does not have a usable constructor]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/form-control-infrastructure/form.html.ini b/tests/wpt/metadata/html/semantics/forms/form-control-infrastructure/form.html.ini
index 352bc7f2d34..7c7a6cca1b1 100644
--- a/tests/wpt/metadata/html/semantics/forms/form-control-infrastructure/form.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/form-control-infrastructure/form.html.ini
@@ -8,3 +8,4 @@
 
   [label-with-meter.form]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/the-label-element/label-attributes.html.ini b/tests/wpt/metadata/html/semantics/forms/the-label-element/label-attributes.html.ini
index 77caa827250..9caf6fc4cf7 100644
--- a/tests/wpt/metadata/html/semantics/forms/the-label-element/label-attributes.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/the-label-element/label-attributes.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [A non-control follows by a control with same ID.]
     expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 83ce92c0a17..aeb28a8527b 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -9595,6 +9595,11 @@
      {}
     ]
    ],
+   "mozilla/referrer-policy/generic/subresource/a-tag.py": [
+    [
+     {}
+    ]
+   ],
    "mozilla/referrer-policy/generic/subresource/document.py": [
     [
      {}
@@ -25789,11 +25794,11 @@
    "support"
   ],
   "mozilla/referrer-policy/generic/common.js": [
-   "6882adfd624da27cd226e1575988e85ad4e0a562",
+   "3b15dcb7447fd6a534c66218a1eff1d4c6cbf79f",
    "support"
   ],
   "mozilla/referrer-policy/generic/referrer-policy-test-case.js": [
-   "7a062c25bdad48a7ec6118596549833aee6fcf18",
+   "52a87879b08ec1c90e571ee67e62a36379b38d37",
    "support"
   ],
   "mozilla/referrer-policy/generic/sanity-checker.js": [
@@ -25805,7 +25810,11 @@
    "support"
   ],
   "mozilla/referrer-policy/generic/subresource/a-tag.html": [
-   "eff75f9269f65647f0a679b156161c2e1904b86f",
+   "d8164c4aeae423bd4e10159acb8db7ae7236c968",
+   "support"
+  ],
+  "mozilla/referrer-policy/generic/subresource/a-tag.py": [
+   "317f92232570959c346d47f1f4e5a911c46b5da8",
    "support"
   ],
   "mozilla/referrer-policy/generic/subresource/document.py": [
@@ -25817,7 +25826,7 @@
    "support"
   ],
   "mozilla/referrer-policy/generic/subresource/mozresource.py": [
-   "333a80e3d4aec4a8be5566605fae5675a821085b",
+   "d5e7151e650a785f23df411f1f302116372f4dc6",
    "support"
   ],
   "mozilla/referrer-policy/generic/subresource/stash.py": [
@@ -25877,7 +25886,7 @@
    "support"
   ],
   "mozilla/referrer-policy/generic/tools/generate.py": [
-   "613655e987f32753e9875cb52134a94ad48a3fe7",
+   "241fb5749d046409fbdb9a1c46751359fd4ab059",
    "support"
   ],
   "mozilla/referrer-policy/generic/tools/regenerate": [
@@ -25889,15 +25898,15 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "36680e3a00fe7c12303c0f9326cff68c3d6799ef",
+   "ade7454d3efedf61c4e03203be3d52a3859b77e6",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "80316b4872849929b1afa9ac55110d328569eac7",
+   "c2196e3c06f499f76ad3dca727ab06fa84564eed",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "7acb8b5996736d1b18327c09399417649208f2e5",
+   "bf3f12f42868e72fa0a3843c4a278ffa4ad20237",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
@@ -25925,15 +25934,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "28a2af011cf3c4ab2590b427f8cf122bf9cb28e1",
+   "6ccc1aefd35bb4c1e7ede4eca1bfa018bea7eae5",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "fd60e09c797ccfee0a59205dcbabd594a6e386a1",
+   "be24c2c996fed71dc1e224b3b2dc3f095d36e461",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "b51c9aa4774faf71069823416084e8d14eed77a8",
+   "9443783b0e15ed28649ad4d3f1efa6e6864203ec",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
@@ -25961,15 +25970,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "3ff90b42b4a556e35450eb839279acb415bc03e6",
+   "0edd9fe04df7378ce861b7f360d9c5e39c0c29a8",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "3542a78b9a8ac3e44cb7a5d5b749d0e8f3a8de8e",
+   "36ef3e02e5574fe55f780bec17b80ff1c81532ca",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "0f601ce809e920e792a868cee66af6eee5943112",
+   "cf70931efb92ae3f8cb9336b55ffc8d62b2abc35",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
@@ -25997,15 +26006,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "7c4ed9cd57d9a819be1e2f88496b356ca405f39e",
+   "d0cc44c1a9e192d697ecb399f5e0f9c24038c41b",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "359dd919f7f24130e72f10d447691ca5b3b70143",
+   "00b1d8b2546f2f8a3893a692aafd9b3654da2f8f",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "07ac94c4b890d42a1d994d6d48c69b2189358c59",
+   "e19c589e074140b9b51982e015e2216f1b4040f3",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
@@ -26033,7 +26042,7 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "aa9ca86bb41e79256ba44389f3ec8fbc5030d60d",
+   "c8634d9dffbd35d1f54dc496d742aef566d81f54",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html.headers": [
@@ -26041,7 +26050,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "a1d139077f5ba3e48db6c8694921aec23059cd15",
+   "a16779fe2e957551772bbddc75840f0d2c0a3f24",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html.headers": [
@@ -26049,7 +26058,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "84800458f692a44e1015e23f837cccfec1e4ac66",
+   "03d91f8f335ca04ccb4c68c13bc82b0135d70c6f",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html.headers": [
@@ -26057,7 +26066,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "2a7a72cc53142ac25739aabbce0b1f11fb338263",
+   "6336aca2e30e109afdc1edbde1eb28b82cedbb4d",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers": [
@@ -26065,7 +26074,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-   "6d58aac2a8ab48c7159c65446cccd49e4b65e275",
+   "4610ef208757ce7fdcc6db457d49cc7efb0e41a6",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers": [
@@ -26073,7 +26082,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "dfc361c6acf2b927d15743e4a3626aadc248e8e3",
+   "d47314f78f8fffa6788c7fbc77f75ff4ca289f2b",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers": [
@@ -26081,7 +26090,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "d5d578805d8590ef69467c0fab8363f15e39e4da",
+   "ba84bade299b270395afb6d315c6d7b2b0e1faf3",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html.headers": [
@@ -26089,7 +26098,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-   "8d5cc51fff901819878d779df1a130c124cdc78e",
+   "53e619710ea697cd9e0dceb77582d4e8919cb23d",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html.headers": [
@@ -26097,7 +26106,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "3bc22586f90a375dac74b4125bb76c662a83e077",
+   "d8c3587e1d8d2898519f38a52bba86c7e8fa051c",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html.headers": [
@@ -26105,7 +26114,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "e007be067051639be37b47e45b695e08dab3989f",
+   "fc47d6937d082a5f59ac05d54e380a9d6ff12c55",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.headers": [
@@ -26113,7 +26122,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "1114554ad027a8a79712bd5f5e9e5d71c51abf3c",
+   "8dfba6808c895c1066f28d8739860a23d71534e5",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.headers": [
@@ -26121,7 +26130,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "4fea52d412aaa166b771011126cc8e42aac77d9d",
+   "2bec12fd4ddb7b6802a7923e9bb3c6505990200e",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.headers": [
@@ -26129,7 +26138,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "616349cefa785642470acabda1e65661a59da84e",
+   "de3779ef8a0883979770fb7bcc546a67119eec22",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers": [
@@ -26137,7 +26146,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-   "5cbc92b7a3ef8f2272e91f8409ead467b078e9b6",
+   "d80b88c693654fab55a6a044d49e1030b2425654",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers": [
@@ -26145,7 +26154,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "3f124e6ee4628672571af0b3ae6655ed7157144b",
+   "7df2513bc2d8ae2fc5d5e048c669704de16af007",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers": [
@@ -26153,7 +26162,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "9407d4fada765b960e39c285351504cd1f1b71f2",
+   "e433681fd7ac96539203dd93b7a0d8228c760a98",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.headers": [
@@ -26161,7 +26170,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-   "4f69856a3ce43cb19d2571827d154e6286cf4aad",
+   "44222b947c836ed71253c3b1cb3c3b1350cc4813",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.headers": [
@@ -26169,7 +26178,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "ad410e6d88ab874934c371645b9fd4b89da642cf",
+   "92540565d60ecbc8be60e0b618eb3af41a8ff436",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.headers": [
@@ -26177,7 +26186,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "0de8e7f325f4e913f7bca97b9fd69bee3210c64f",
+   "ec0d2fe9f4632321ffde61ac20e3d6e33d136003",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html.headers": [
@@ -26185,7 +26194,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "e449b2a434cf40ed1c2834110f050a38c652315c",
+   "04ede98a2b495dba95432a1da4933b811f35e154",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html.headers": [
@@ -26193,7 +26202,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "c2c4fe55def6beee8c0de0600f6ec5051cebff0f",
+   "c6cd18576943a7d8bc858c606875530f57807016",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html.headers": [
@@ -26201,7 +26210,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "c3fca3c2b8a8f4fbc12ecd16c9ff161923fee03a",
+   "cb266576e2a9c64868e1b5d416ee0849bc1b24e8",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers": [
@@ -26209,7 +26218,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-   "39b4b44339d5f6585457b1ab61d269527a2a5fa7",
+   "e039a11b189ea5d8ba4883de60764dc96f5f150a",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers": [
@@ -26217,7 +26226,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "9aa3ee9f93de36561ab519f4020f04b1099ce959",
+   "9d33ab0378ddb9aac13008e46bed4e1d4d465a35",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers": [
@@ -26225,7 +26234,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "505d44028f1a4da62f03e6fe7a4effab4da5f8ae",
+   "79508d9540ebb20723a0a0cb05e6fdc945af4a86",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html.headers": [
@@ -26233,7 +26242,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-   "15284aa1f3dba1862e72c139d0f68da360f6f759",
+   "267ea88600df794a756e895e76fc363304f55d3d",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html.headers": [
@@ -26241,7 +26250,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "40a3357223d842a52e10c6acafcdf1bce2d2d9e8",
+   "9016fa5ad5ef9b4ca64751277d64ff01ddd111b5",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html.headers": [
@@ -26249,7 +26258,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "9db7479daf4314ce10008759c37d313f30ba901d",
+   "ca865dd4e214fd4c2662a1440a1b36c65a39bb0f",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.headers": [
@@ -26257,7 +26266,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "a7e191689eea3b9da4e4cb95353647da0dfdccb6",
+   "c38ee0eb341805812a1834b5cf0d4c75ee03ac48",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.headers": [
@@ -26265,7 +26274,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "ac29295420d2246636cf91e127f2ddaa5f3013b6",
+   "4b5c2a6b6dbd6972f190d4dc1ff082d2f0951007",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.headers": [
@@ -26273,7 +26282,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "954e847c12aaebf8ea0f97a52a3afc426c336234",
+   "8b28dcea9f44b7851addad4a1ef305c544350f00",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers": [
@@ -26281,7 +26290,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-   "9e0943a78cb701567d29c95ee364762ff0e72129",
+   "c5938bbc67f5c60e83413bf7bf0d22a2f326ff87",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers": [
@@ -26289,7 +26298,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "baf1cb72eeb47db6dfea3de49722c0fea7f34c7c",
+   "3bff36e86e9ad6c67433e6f89aa8e352d63eea80",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers": [
@@ -26297,7 +26306,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "b4764c3ebf5f678383b1361e7428c8e7464459fe",
+   "718469e19b28a91eebcb724392dd0c913ccb2c28",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.headers": [
@@ -26305,7 +26314,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-   "36fbf89f9c71697896b963b9a94796501598c59c",
+   "f8da27b42100a157969639473b3c3cebe4e61ad5",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.headers": [
@@ -26313,7 +26322,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "b30cf704d91d9e66f85cd635a94b4d72a8519d68",
+   "ef4efd95666dd2b4686fe295dc215925ec967333",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.headers": [
@@ -26321,15 +26330,15 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "5f028fede2f70ea5d7b4db5e3967015aa9543a62",
+   "423402b0db320e66588d5d491cbe6b40b3e48a11",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "5a033cd9c0c52e4599cc50dfa082f3e59a4dfe74",
+   "567da5747b86bb445c474a35f68f49825fa9dbac",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "12c42978139d1a09042c1c7694cbcfb7fdde5157",
+   "604ad932c82875714ca9b119467f6b9b445e35d4",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
@@ -26357,15 +26366,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "4766a734d885a0003ad31bcff480a815ed89aaab",
+   "f939892ea3b6dc087a356ea72257f458416de44a",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "7ed3e3ad6264af29f4921b596f0328409c10d962",
+   "0be5f0d8125827af51ef3da4b43682ef1124e77d",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "75a83a08b4a7e1bf4e46a8cd8bec8cbd9affde1b",
+   "defd088aec1ac7a278a05f33e5d4195906036dc6",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
@@ -26393,15 +26402,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "698eab730b161ba8fa28cdc7cf0f8a37210bca3e",
+   "5672133beaa7159c240b3b926237346c54f2796e",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "36d77f49e824842f7cc8268a324c6cb95d135224",
+   "63e3c04f326f568e6cadeba0416f96af48259635",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "24652cbd12cd310faa0609e9201f999a83fd3ae4",
+   "f8c30386efdd4b4adf69ddd0130775252108b8fd",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
@@ -26429,15 +26438,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "2d3197d2429562856fb55495ea2ec7203dabd0d2",
+   "4248a88bde0c536a3b0457de05ed476b7c484bf5",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "9579a0b8b75d766e2cdfd4212adc24a72e51a1b9",
+   "b566dc2fe70eae50d04cc2eaef7f918a665d157a",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "ccf12df31c87078d9785364a46077a2f39e38c2f",
+   "09ce3650fae6c6721b87939ba5b497a97e194c86",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
@@ -26465,15 +26474,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "7ccec296bf39f057b27fa9e47891df4879787bb5",
+   "f3b13be3f8315ea6b55525106a3c82a64984eec4",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "ed21178235322f65fea758bb3030d2c31e72e4c4",
+   "459486e82628fff3c8f7fe214468f96a1c7a895f",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "6ae066b0856a2d7ca40b9c8c0bb7baa07906a754",
+   "cccb46c66ad606ced505361816a54bb9fb48d188",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
@@ -26501,15 +26510,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "4763e43f4fa797a9273fdc239a7032d9900f0aff",
+   "f2022d70180c14fa19d39b5cb0ae973608fab797",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "2c983856fa53f496fac63e78c92b5c607c8b7dde",
+   "b4137154310d2bdd245e0e1225cd03b8f3e0a95f",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "f0b04697458deb4738bbe3491fb2c073245ef50a",
+   "ec6010c8a245c60dfa78c2309cbd73d23c95300d",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
@@ -26537,15 +26546,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "d73fb2f4ccf9bbcc621578c15fccf94a46feef10",
+   "662cf4a1b337c4b6713dc8159214bdcecedc5fcb",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "8be0935c19fdc6b3657a2fd96f96bac46eb53469",
+   "1355c4ab960da18b1ebda8c8bd93098b52f14f0a",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "f46594935e401676c591672ef5a75e0a0b15d3d3",
+   "cf0f3da5afe2ca3a05eb1b95128294bbaf7053da",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
@@ -26573,15 +26582,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "546a86c14b6c7bc8e8f9aec6d87fe34ef73719fd",
+   "4f9794ea010750857b98ccd5c6724f43132149a6",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "0d546b08081b6b067a19a9d12f3b72a39db01b14",
+   "ea1a7cd5a3c391c7abac61a8d05db0671355f2b2",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "5ec958e0f339fb9ef4e2728995aa895a69997be7",
+   "d7880185a7971242c6d1ee1cba27d30def722071",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
@@ -26609,15 +26618,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "0c55f68c6df25a2fd55446f6fdcd4ae8c90f6c01",
+   "a0681d2b37bc1f4e5c4587402c27c1e5a933361c",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "00e3ea1e913ce2d689a498bd13cde09a82a5ef17",
+   "e40a058c1d739905cd99307b1aa80c4a253ad0da",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "badd73a218404d694f6249740e3162b24d7642b8",
+   "c27d07b06d4d26ddbe95094bd195e2fae00da028",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -26645,15 +26654,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "d97593e8615dbccad5157edcc269e7ff84b053f4",
+   "49d445c5b72d9df3b00d97d7e45265125a1526f8",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "b7e221c2bd98ca96a40de144bc3cde950959f38f",
+   "f76040ed0137a0d5d4ee85fc7eda051db9742955",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "49b574917ed5d5da98967fdc6e88741f422fb50e",
+   "322594de1f7aca3fc36aa99109713d1aecbb9a22",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -26681,15 +26690,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "50a1035567d346acbe2667e883fa3a0952dda9ea",
+   "dc426f2f833eebcbface0c6fc1e46fd383675c68",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "dba52e043c8af2c791d7ac61e0701011c0d3ef27",
+   "ca30a0666edbaa626bd99a3115c21ed4e67cd214",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "f40254dac0d104ea3c8970f57ab5767c2f22945f",
+   "95d95f6188b522f8dc22e25b8b07ad3ea9ae3a0d",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -26717,15 +26726,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "e717b7a5a07d4a4cd5f69e07df4e46adadda2a07",
+   "0f6097aa6c74206ce699b9cbcc8a05e2df3e1c70",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "3ba9d13306ee1d89cb197732377e9fa53b726da3",
+   "cca302eb8c03f10fc1736ffa1388a91fe2e6190e",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "fe4ed5e7538e82d3a32caa0c088f0ef54b2fb8f6",
+   "a3134a800a49ae81694396e7335f447bab78ad73",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -26753,7 +26762,7 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "474b4682781958919b2d05f0a63b9086923b45a4",
+   "a9243ae9dcb65e66eebd194ccbec4bff9a543d9a",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -26761,7 +26770,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "b70f02b44e283e476fdc379cb74b382ed49d5749",
+   "7ee95f4719ce31b5812b1569417d92bae33280e0",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.headers": [
@@ -26769,7 +26778,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "3bb0677cbbc59d2e0c9843d2eb04c294a2bddbf4",
+   "67ba16e978e004e1bab89fc1c20530fc397f7ea5",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -26777,7 +26786,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "1d695d4517a3674cdbb9b6728297d224ed39fea5",
+   "655e7239cbf33b021b6609ced16967e890ed74e8",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -26785,7 +26794,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "c88271718522991c2d52bb9233ddc7cc89b8d38a",
+   "4404864b2e2ece321f8f72f71341452cc66d2e01",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers": [
@@ -26793,7 +26802,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "bcc67c0808d0c93090074c1b7fd4d4299c5fa465",
+   "59598853f174b1b419d507698887781dac1ad46c",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -26801,7 +26810,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "68e8249ac4561bdd8fccb915bc9981f553fd7d2f",
+   "e49fce44dea3272514cb2ff00fc3742b642a8443",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -26809,7 +26818,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "c3d26986d26a147c7dea6b1e7993079bd2910b23",
+   "0c6e6c5e83f66dc8d2bfea804d40954ff0852aea",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html.headers": [
@@ -26817,7 +26826,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "f7c5253431a7a23090fa4b0128a32754c6bfa668",
+   "4beb32534aca54535d87ca585e66ed4d1eb72e6d",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -26825,7 +26834,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "1a87ef3f841548b845fa735bb8b6e3a64e28a79b",
+   "4884c975050aa0e8965988ceabe0fa1ad174b4b2",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -26833,7 +26842,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "1cac0f54f7521203386abc90ba59ff76bf666fbb",
+   "e21165f464dda70575cc44e4d4ea99c0f55be265",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.headers": [
@@ -26841,7 +26850,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "0c97a974ba3d707f303d78830a3f72437c15d47a",
+   "8e8aa336daa5c98090a01a306cdfd4dcc64e77aa",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -26849,7 +26858,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "8c01ef2436373922a903235a1c4eedb8e6e79131",
+   "5f651dbb2e3805e0800c87aae79637c9687d2716",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -26857,7 +26866,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "6cbf697a9d1d096d034575f75f65c402c09d8b26",
+   "8b75eabc42bb056fea3ef12ccf7caf1da85dae2f",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers": [
@@ -26865,7 +26874,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "98b064875e9ee3b2dfd58b3aedbc69dab9eeeb51",
+   "4f99f135b3595a56ef3d99229dd7ec113c28e1c4",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -26873,7 +26882,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "2b7b5d9b4b71b1398263fd74c3aa102c6604161c",
+   "5d6fd12e1df95ee66fa1764363819d1c1c6b162b",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -26881,7 +26890,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "6dce735b31f6dff429dde7c2c2f6176923c2fd4d",
+   "ceb9bf1c550b5cee147a94202839e72afce0a7ef",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.headers": [
@@ -26889,7 +26898,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "a1d4152882f1df7eea2d4358b3e5b0f2047948c4",
+   "ba60599f7980ea5d1870f497f61d626be6547375",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -26897,7 +26906,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "e313cd66d397196bf59be2b9a75be4c0c2f02284",
+   "de1e68256762cfd91f12f373a438ecde9610aa85",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -26905,7 +26914,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "4c0674e8f377dd940a27063c4989010466dfa11c",
+   "4d6bfe5f86ba8dd58dfe72c88ade3a7abcf91bbe",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html.headers": [
@@ -26913,7 +26922,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "a422b18040b9b633e88295ed32d0d17d8bd97225",
+   "949807442ba4975df9f4c633edf0e580c5ca72ef",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -26921,7 +26930,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "a30b4715d7f4d6f2d7a79629dd31ad174fb3c8c2",
+   "6a6c9bc2b3085ffda3a23303fa13fe39f278e45e",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -26929,7 +26938,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "6a20f50305dd35e29f1bdb318437baee674aef62",
+   "dfaa6b51cd36d94c19293a51070f2e4481a7d96e",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers": [
@@ -26937,7 +26946,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "c6cedd8f17a1cd56cac0dbb72d94a2111e714ee2",
+   "f6f70e48931859f10e46608373a5d25752531bd8",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -26945,7 +26954,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "22e729aeea791c7bdf82ac37f2a5e6eb957ea471",
+   "e33f345e864e9cb78dd4ea0f4b9a8aa595cb6898",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -26953,7 +26962,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "0e5296ac7bc9da765746fcb0f854aed20385e44c",
+   "9f68b10603b662a967ce7e26bb42402e65b5a834",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html.headers": [
@@ -26961,7 +26970,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "4c449f2fc31ac33fb66b2a0a656dd9eb2d5c8ade",
+   "5b7ed71cd79e6af9c8e28219188f5f3c7506ae3d",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -26969,7 +26978,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "10f7cff45c469bab4f2edec352eac086105937f5",
+   "9afcfe6cfa8bb471e0cec2d9f3a89dd5fd898547",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -26977,7 +26986,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "d3ea995ea589434eb859391f03e8a1038fbb6db5",
+   "6180133beff10053989424629ffb72dda0b5c3d2",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.headers": [
@@ -26985,7 +26994,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "0bbf63d47baf855f2b831dd688539545c35dcd8c",
+   "96c9cfd3b3ead3c64649f9867a162adc04d31ddb",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -26993,7 +27002,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "95bad47af854be82fe2fd3df284ee87e69d1f5ec",
+   "16cc9deb740f087500a75eda12a3c53292b0994e",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -27001,7 +27010,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "392063d9c0f56e6b796174edac8d34f4f8539372",
+   "dffbc12d8d815c909d016f8bb69fe0d88a2f8ce6",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers": [
@@ -27009,7 +27018,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "fb9ec886bae87e56a971a105a9ef217e9c0d91b3",
+   "b42e6a089a127b42705c71f90274ef86d0cc9b93",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -27017,7 +27026,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "c398194ac72a58c6c01a762460c53e544d5542f2",
+   "f34ae59bef4494cdcc6b17287ea5353c14f3be71",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -27025,7 +27034,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "1e2e4ba1bc6317a596b964cf8dfc806fb4d807c4",
+   "f85841a8c93ef5589759996d49dd53960d9f33f6",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.headers": [
@@ -27033,7 +27042,7 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "fce08fe70a4b3fd485aa757a88f74db3dabde976",
+   "4d6e26df28317e4c939b4b6a2c079e488ec71f63",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -27041,15 +27050,15 @@
    "support"
   ],
   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "234b57a607df209fa8c73d6604d431022627bc0e",
+   "47a6b6730f4f3ca4b6f068eeeccec828bfffedb8",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "f8a067663d2f770cdbba043288d18570120580c8",
+   "0a0970ecaffceac3a444009dfa78e3902a4d97f6",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "bba53158fdd0984d5cf4f5203c615ea40bcc4328",
+   "bb50f503912e32b0770ad0cf6b778569e28085b4",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -27077,15 +27086,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "3e9057fb56ed2cf6a192556efb64515d5d53c1cc",
+   "6b9e62581dc70797fb46d33af80820633847f32b",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "13ca993f74d5bcf78e9232412b9af0e1b6173812",
+   "f8ecf21ef8b11543356d51af944e4d9e46752ecf",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "04118e060c16784709fe036904f49ea85d0eecbb",
+   "f04670603f5fabf61a2f63605a30cec09961d815",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -27113,15 +27122,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "d00db0aacc4f1d97976f634014aefdb88f38371c",
+   "9f40185e818934bb53677832ab0a76f776c3e839",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "331b353797b1b24aa39663648e41e594e518ea7e",
+   "31c638837206725cc0393f0621c580108984bc23",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "c5f524e44e991764759ea91df523d31fbcc141c5",
+   "46b02f015030eca8b4d038896ffebf2329d8438c",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -27149,15 +27158,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "5e2411a7a1f69a78893bd0106f73a441d05ec808",
+   "0f4e3dc9b3587029c8e8adfc66d479faa263a432",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "0b82634ed467a4495d65b401c58febdcd595db61",
+   "5ff9f79ba00b3da17d3a453bf77562c06879d8f0",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "d2220b5d542e75660b8b915ce6d8d9bdc5c08d66",
+   "01932c2b31667a3edca58723d8eb80dd04079f26",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -27185,15 +27194,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "c0fda26d13988f0e9e8fa219bbc943e57471280f",
+   "b925f0573a05c0dc4dec88038f75629f45ea4e4a",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "04b17e61f562eeb7be1aa881a303315552f98f1a",
+   "e0cda3ae7ca77f85c247c86531fa521f13915d5d",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "2dbdf531bdfb1403c610e935215c736549fe9ca1",
+   "d84bc39c25fca22a6a2849177a4b3d2be26afe1d",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -27221,15 +27230,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "0df2dc090062b20cb7a349f09b91e16a1a6a7792",
+   "b1e7aa093557cfb9b53233e9743eaf5bbaa63171",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "f102ea5faa447dc467e929b4775085b037baf73c",
+   "f7debe686edfbe9784f927abe2fecc7e0ff84c5a",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "b85fbdbb0448a887611be177faab24f22b4aa11d",
+   "56eaa8540e61f0c48041fe3c4017f1cd3406563b",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -27257,15 +27266,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "4bc41834a4afab5bfb5eaa795c003b4b461b5a29",
+   "a64977cb1d8150926a1efd76f3edef3d631fb096",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "3e81ed5e441e2edf22baf65b47ac7c15d34c5785",
+   "b2dddfa98906c2292a14744ed73e78dc295eebe0",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "4db3aca2e8b73a5867160e3c6af1c44abe20d336",
+   "190b922c7f57cc7337bc0769b0702ad7e7bb96fb",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -27293,15 +27302,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "40fb4171b8611ec74ccf5dc40fb16bb44debaea6",
+   "b130c619d1b4d55965d4ad8ad39592bb3fa1aba7",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "08e5ad7e041e40c63c77bb814a4447e4bf9b4d24",
+   "19642fd2410ccdbb385aab2c63cfd6a4d14d78ed",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "36f39c8252189156176761528270a18b846966be",
+   "c871639f25bedd0f5d921d063f8543102c5343ed",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -27329,15 +27338,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "0eef5b640067cff1c57d947d6f16ae445c57e080",
+   "2cd8f9257f856713f55abb5c2ddfd41171f6d0f5",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "1b3f990d71b40e1841fc37aae4fb911e98a1b6e3",
+   "bf24691af7870b3ba09aad283e48a783fffcdeb5",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "99be693252598dcd0cbb40ec557c22d8aa993469",
+   "d1e7f72ac2dfe39f85b2cf2edb3507d6de670bfc",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
@@ -27353,15 +27362,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "60b9a57c7207936fd393cad178571d1c64d2216d",
+   "517b729f7f682472d62c93ee0d723cb340c76bf4",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "892be193c7f12261a78c12328be738e3d54b76be",
+   "95364832c89ce29404c70ee363780458ad6c0881",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "242eda9ef72bb6eb303f5a52e7e2d29375c3c35d",
+   "6cf343ba8989ff77c9e942ad748fa4421395ee53",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
@@ -27377,15 +27386,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "9709968f2c0057f0fdc7f6f3bf2c172f95a53a12",
+   "c307f9fdaa374584a0100fd6a78b8804a9597372",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "550abc55c8bc513a0c78740793b2b2ddaedb602e",
+   "d52f7aa4348a1b410b804937e86fd0f8d0614381",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "3dee073f387730b1f3f6dea9192732470a8c25bc",
+   "ab747e5b5d824b38ebb416ce1b86b2fc814b7e87",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
@@ -27401,15 +27410,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "9f49e59bad9ca947f49987bf81df0e207257fce1",
+   "feef9d5234721f9728b280fb30cc45485a251c5f",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "97bd969fca9d6c9a9e5f4660c235a2e5ddc479de",
+   "ddd2df1c0cfe04eb38c7309c8e520bfca65c1fb0",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "2bd7cefa982c69331d66838dac0fb0dd4e79364d",
+   "d01cb74a0051d4ee9fc292cad8d1f04c0ba70f47",
    "testharness"
   ],
   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
@@ -27425,15 +27434,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "be52cfe5952e2f826f6b0a08525ff9494fc285a5",
+   "2f2a5752c8419e3c9d84bbc0d85b47e83c8675b8",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-   "b9e08859bbb0c2e43adc1333d8c435f76d489a70",
+   "3c1d09cc700205d434a45a10dd0694eb1df0aa46",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "37758425db45d8507068a1111f5ce8aa61da51a0",
+   "f29624be7a7e10b9d7c292b608dbb05cbad2fcd8",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
@@ -27461,15 +27470,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "a5f747191537c0b6acf0b32bea8da7609c54ac8f",
+   "7728974137e3f419b5da256772ef29c0c961cb5d",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-   "05bea8d0e50df3dfc25aad5fcb29e770b91fa453",
+   "a69cc6190082a36db8959101f8a6b4d5040593b7",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "1b572b3725490fded5d5f4f9c3c6608c2efc1e3a",
+   "e3debbc5f0b947c2104e1d0fe9f9e2353d8451af",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
@@ -27497,15 +27506,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "a406343bc9b23a2c61a4948aca9f22fecbcc6d07",
+   "3c2d11f96b02d669b0becec7abeff689884a72eb",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-   "76edce428ace5dd2daad30e2d798fbf40f1fbe77",
+   "0b2264a40ff1c0323b99fbc9f18fb7a37ad19ec3",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "cb7bc919ad01376e2d3d12111263267967db4b9e",
+   "caaffa8626f97310efbf6a12856828da4e8a5e95",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
@@ -27533,31 +27542,31 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-   "fdb5b017e707f6b0788753e93148032ccefdc76a",
+   "abba941de1e3409711e18d33a5ba4be74317eb54",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html": [
-   "ef7881f0cd18cc9de28104d7c8fa9aeef535ebeb",
+   "3e079fd53487ab25fae2d0ffb846aa84adc9e465",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-   "ecfd88b799baf4792176b38dd4ce02cfb978f84d",
+   "f73bc0881bce1c838c998c69714a8e3f32d3696e",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "ecfd88b799baf4792176b38dd4ce02cfb978f84d",
+   "f73bc0881bce1c838c998c69714a8e3f32d3696e",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-   "fdb5b017e707f6b0788753e93148032ccefdc76a",
+   "abba941de1e3409711e18d33a5ba4be74317eb54",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html": [
-   "ef7881f0cd18cc9de28104d7c8fa9aeef535ebeb",
+   "3e079fd53487ab25fae2d0ffb846aa84adc9e465",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-   "ecfd88b799baf4792176b38dd4ce02cfb978f84d",
+   "f73bc0881bce1c838c998c69714a8e3f32d3696e",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
@@ -27617,7 +27626,7 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "92fc2a4175dcedcb6734e6a75b7dd6cc72bacb42",
+   "05669d9ada7771619d0ead41a0d0d8e10a30f7ef",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.headers": [
@@ -27625,7 +27634,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-   "d0d22415f372a1f0c94d5d7f1160caa8e768592a",
+   "347f69a8b8c49fab605178513e6236028db54fc8",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.headers": [
@@ -27633,7 +27642,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "0f35590e00d7509f79d6c64ef1f5d29a4ff30a57",
+   "6b08d08a745f5df5709ee6680370ee633e461f96",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.headers": [
@@ -27641,7 +27650,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "b5daf5afde36883fcf0cc418cf98b47604bfb9d1",
+   "81eed7968f1d0fff8e5365c9542985e201dc17c1",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers": [
@@ -27649,7 +27658,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html": [
-   "3351e5e6f91bfebb3bc702bc4d6e2b47a336e8c5",
+   "8d7121d052d2582702807883beee42ae075d9c81",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers": [
@@ -27657,7 +27666,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "b02160642139d4cab3eab0f41eee350797b27f4b",
+   "5691d133fa54ebdd5036093707911c5070579fd3",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers": [
@@ -27665,7 +27674,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "63b3cac1a0aa573c076c880ffa226bbd72ddca0d",
+   "60d34bac5b9e3dc17c128d1570af15b71ab09920",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html.headers": [
@@ -27673,7 +27682,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html": [
-   "4a99baca1cd92eeb78dba724cb23bf5e9eea32d5",
+   "40451116aba0d7d153fc63430609a0ca19e3439c",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html.headers": [
@@ -27681,7 +27690,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "028e2e8ff06051bc2a42f832219b284d6c5cf476",
+   "ce8be35915f2cd998c1f9e5c33e29a1b9cee708a",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html.headers": [
@@ -27689,7 +27698,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "ce664408f1f6242bd523fd412ff02ed0ec712964",
+   "7a82a0a4cf1326d51fce843f3aec03971a76550e",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.headers": [
@@ -27697,7 +27706,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-   "a0d468ceda1fa1e21840fac5ea896cf9929c4760",
+   "e676ac92c4612204b1fef94370706fb946df1dfe",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.headers": [
@@ -27705,7 +27714,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "1d284b56e496c12c6de65ce627fb8dbdd3d4e04a",
+   "a0cab48aea7df8c3fc03beb1f53d8b0f4e051517",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.headers": [
@@ -27713,7 +27722,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "692f314565e9d0c0d492cc4c804cb30fb8467ee8",
+   "c93a7da54a78431e03375340c375e50cf24b0f28",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers": [
@@ -27721,7 +27730,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html": [
-   "2ae4f77a0deba6945cacc303ffeb9bb8e64e30ca",
+   "819d9c57f4ae58db3a7da25144bacb91f2b6c528",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers": [
@@ -27729,7 +27738,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "c266e527a8a4781281204fdd048df7dffdb92b1a",
+   "4a07a679b3df286a1c992196fc1fe2ba8245fefd",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers": [
@@ -27737,7 +27746,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "bd2e9d8630a9eca7553e69717c32015128dbc0bb",
+   "246f6b963c82913d30b4d02646ddf94dcfebccc5",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.headers": [
@@ -27745,7 +27754,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html": [
-   "9aaf6682c6a4d60e32cbca789bfb4fefcfdd22dd",
+   "d479abb0b3dcfd30a4385b4632506932ccabbabf",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.headers": [
@@ -27753,7 +27762,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "fc3670b8c55b6f301acb8cc3a41d09c41d85a638",
+   "8855665f80a5df3e37a91cbb78f4315d8de7a8e6",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.headers": [
@@ -27761,7 +27770,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "ec5275b5e310b69a561761be658ac28028a94ef5",
+   "b454b04edf3f036d61fc88dcfcd59a2b8e4d3490",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html.headers": [
@@ -27769,7 +27778,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-   "72fb1d09f005aa42ed7e4f281caa8467b4ba86ff",
+   "c0467650a80ec43bcf7170af4b07dfc2a1343a0c",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html.headers": [
@@ -27777,7 +27786,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "bc2acdb16729c2c1077e89fa34b014726067140c",
+   "1cc98d1d13a910d5e8192418a9e7881826a29364",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
@@ -27785,7 +27794,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "726a852dbc3842563d84957d75811934dedd7a8c",
+   "f43bc76b071bca020df04baa09d3865dadf5ad86",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers": [
@@ -27793,7 +27802,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html": [
-   "f7876f0454c3010ef17cdd089eeeacfd33b52738",
+   "b2bd932075815208f2b42c4d19643d9fa16dc478",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers": [
@@ -27801,7 +27810,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "3559829350c11e57ce8a282ef98c3cce0c41233e",
+   "ae8f04721243841fb21e34589072f248ff460ac1",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
@@ -27809,7 +27818,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "b9754db7daa7cb0ddaa1f77ea940150cf09c6cdc",
+   "0987e67741e5058e07083c33233fd6b79ee4286c",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html.headers": [
@@ -27817,7 +27826,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html": [
-   "34298c2b66dea52d3693dca0abfa6d17bdfb11f9",
+   "60eb63cb788aedd333bbe6cc362ea86433b22e8d",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html.headers": [
@@ -27825,7 +27834,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "cf6a09c1f446ffa26468af03d1f8b3f6facd51b1",
+   "0a98906707688fa0b6a3a5550b2fe7549d618933",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
@@ -27833,7 +27842,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-   "d0c65021dc0b97b73ae222e47396a5cbb480db02",
+   "f73a3aef146975be57fbeee0dcde11807ed2a47f",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers": [
@@ -27841,7 +27850,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html": [
-   "4a12aed71d37b97fe0d6d6c82459b9a290bfc656",
+   "79798fc17c5f94ab6ff6d7c4f71c7bfcecd695d0",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.headers": [
@@ -27849,7 +27858,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-   "8f3ce4390d06a44113d8af1049e756d771ff2bae",
+   "600b825d267e6a76827fdf0ae20adb08c970c7c7",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers": [
@@ -27857,7 +27866,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "8f3ce4390d06a44113d8af1049e756d771ff2bae",
+   "600b825d267e6a76827fdf0ae20adb08c970c7c7",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
@@ -27865,7 +27874,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-   "d0c65021dc0b97b73ae222e47396a5cbb480db02",
+   "f73a3aef146975be57fbeee0dcde11807ed2a47f",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers": [
@@ -27873,7 +27882,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html": [
-   "4a12aed71d37b97fe0d6d6c82459b9a290bfc656",
+   "79798fc17c5f94ab6ff6d7c4f71c7bfcecd695d0",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.headers": [
@@ -27881,7 +27890,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-   "8f3ce4390d06a44113d8af1049e756d771ff2bae",
+   "600b825d267e6a76827fdf0ae20adb08c970c7c7",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers": [
@@ -27889,7 +27898,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-   "42bcb3422aef526151365016f98df7f6d7bbba66",
+   "1329ec4ab5589a96d0017da3e251d22ebbbc20a5",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers": [
@@ -27897,7 +27906,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html": [
-   "9d1b18e70181f1a389a2d63434f5b18be585c13a",
+   "64fd60c5b73e1ec83efd9c96fd8cb96c03f7464f",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.headers": [
@@ -27905,7 +27914,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-   "6a494c68e4d35c1f47137aa52f14f79360ef2c31",
+   "fe08c3755a3ad61a1f283a9bb12c89a887458a0d",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers": [
@@ -27913,7 +27922,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "6a494c68e4d35c1f47137aa52f14f79360ef2c31",
+   "fe08c3755a3ad61a1f283a9bb12c89a887458a0d",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
@@ -27921,7 +27930,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-   "42bcb3422aef526151365016f98df7f6d7bbba66",
+   "1329ec4ab5589a96d0017da3e251d22ebbbc20a5",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers": [
@@ -27929,7 +27938,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html": [
-   "9d1b18e70181f1a389a2d63434f5b18be585c13a",
+   "64fd60c5b73e1ec83efd9c96fd8cb96c03f7464f",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.headers": [
@@ -27937,7 +27946,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-   "6a494c68e4d35c1f47137aa52f14f79360ef2c31",
+   "fe08c3755a3ad61a1f283a9bb12c89a887458a0d",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers": [
@@ -27945,7 +27954,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-   "89b419724f5753ea9013d48a492fac93ec5d54fc",
+   "db431cd0a97e98dbc65b4e04d9d5c4c4ce7fe4c1",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers": [
@@ -27953,7 +27962,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html": [
-   "cbe4069dc2d99cf02d6dad7f23e5705959da9244",
+   "a82378746c09fd2efc5c09664eaa01dcea4e7790",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.headers": [
@@ -27961,7 +27970,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-   "18fb3ae6d11df503014fbb92c7e2ef45c1624ac2",
+   "419a8048a2a8bf6264669aa7f2402110a3fbf61d",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers": [
@@ -27969,7 +27978,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "18fb3ae6d11df503014fbb92c7e2ef45c1624ac2",
+   "419a8048a2a8bf6264669aa7f2402110a3fbf61d",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
@@ -27977,7 +27986,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-   "89b419724f5753ea9013d48a492fac93ec5d54fc",
+   "db431cd0a97e98dbc65b4e04d9d5c4c4ce7fe4c1",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers": [
@@ -27985,7 +27994,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html": [
-   "cbe4069dc2d99cf02d6dad7f23e5705959da9244",
+   "a82378746c09fd2efc5c09664eaa01dcea4e7790",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.headers": [
@@ -27993,7 +28002,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-   "18fb3ae6d11df503014fbb92c7e2ef45c1624ac2",
+   "419a8048a2a8bf6264669aa7f2402110a3fbf61d",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers": [
@@ -28001,15 +28010,15 @@
    "support"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "b21afa3045193d90ddc3b3cb8220c2de74c251b7",
+   "139310c8b6186c663f5b3cc137668669690f98d4",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-   "a73ce0e53c4f1f3c2b22b1094d8f932e992db2eb",
+   "177f56792bb42d4a5211350c20e19749b5721f9a",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "bf34fe74b08fee5a0c5db948f1d8984a11294d55",
+   "99d91d59910d98ada46716e61494ab69fc3a596f",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
@@ -28037,15 +28046,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "f6886e856e6555267e6d3c3725077ef568194661",
+   "afef207ce494ddeb45221f556e9390719d228391",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-   "081fcaed355db5ca141f1fbdb766bb2ff66dad36",
+   "750847874cf98f39af69b8e09e8a44e5e9d152eb",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "bb78c829f2aa1c1e1d760716cb50e2a5bad93780",
+   "666399ea1fee9bf57cb390b03b1b28450d0d935b",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
@@ -28073,15 +28082,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "657f01553b1327038753533356c12379da09cdcd",
+   "623c4ab41cd2c7cb3c5a89e0a8af6e5b4057c41d",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-   "fde6d1bd3c45063413fe9970019411aa7e3820ca",
+   "f81468dcde9fb2ae1cea4ba92649ee3096a51281",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "5b402a05dc70babf7540d2ba0c6f0f31768cdc48",
+   "b709a30bc4954f18c5a1466314e02428d7239773",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
@@ -28109,31 +28118,31 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-   "b97e4afd7199f5eeb2653d3d632f7bbc605ae4c5",
+   "762384e85b393b586c5cea9f01baf5e4f6807fe2",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html": [
-   "fa3e20778dba25fba774e5864fc1a104b0ded8bd",
+   "017fbcf3214a174b1142c8a9e1a4ec441c2171e3",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-   "529d93e8a7db2f006c11114b8bede75056d5f76c",
+   "16a28a130841c384f4c6671c8d02dd3bb4708b5e",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "529d93e8a7db2f006c11114b8bede75056d5f76c",
+   "16a28a130841c384f4c6671c8d02dd3bb4708b5e",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-   "b97e4afd7199f5eeb2653d3d632f7bbc605ae4c5",
+   "762384e85b393b586c5cea9f01baf5e4f6807fe2",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html": [
-   "fa3e20778dba25fba774e5864fc1a104b0ded8bd",
+   "017fbcf3214a174b1142c8a9e1a4ec441c2171e3",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-   "529d93e8a7db2f006c11114b8bede75056d5f76c",
+   "16a28a130841c384f4c6671c8d02dd3bb4708b5e",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
@@ -28193,15 +28202,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "e165746a91d6d950e47a209109f6ccb0351c1ff4",
+   "5c68b30edfd12de4b18b5dc30a16c095f688f909",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-   "c70cf119d0e6a07ae16190fce5aa9f9c9bc3f996",
+   "fae0440633d3ac5d214871443966dc2038435654",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "e00f0938b9834469d1eb088435b5b5e871f9fd21",
+   "4aea7f1c2fe766068042aec141764eba0719b552",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
@@ -28229,15 +28238,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "36f19aacc1d2e2e1990c50a89ce838b0f2c8ab33",
+   "59e0c16550bdaa39369fc5ce8ae8888ed4d026a3",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-   "8a46847efa3068b700f7948e9623e4453ee48a4f",
+   "0fa5ff67efe25e75a33a4d9758f0639134efda95",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "478de2143158f8f3ec36c0303ed516fb00a18c97",
+   "73bb852e5c1856c35d9873e3925d885098105469",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
@@ -28265,15 +28274,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "ad0bdcf658f422538f15da32f9888b2645ab5a96",
+   "8bf6dabe14add12673c859e4ea90f746bee74adc",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-   "eca26353c846a2ae11957d1e3b17a85fc2e71f8d",
+   "5f782b2fcaedd1ab86f0f111f10c2510226cbdb9",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "2e0c9df4b2586be6cedf6b38649a9966b91649c1",
+   "51a3048493d02894ac72987810726d9e644f381e",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
@@ -28301,31 +28310,31 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-   "02f4e949803d00cdc1cefa4706fb8bd5cda66478",
+   "c40de6c4eb8154963fd973c50f74eecbc09a7cfa",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html": [
-   "bcf76c25fd8da5218e1f7e52b5b0de11d59272ff",
+   "0165e20a4625231fda8d03ff7aaf039ac9a987e4",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-   "2e84896965d0ff1e6400ee75f4a02c2e6093f2ba",
+   "69cdca24b41182991145e46a0ace06ca6699bb4d",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "2e84896965d0ff1e6400ee75f4a02c2e6093f2ba",
+   "69cdca24b41182991145e46a0ace06ca6699bb4d",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-   "02f4e949803d00cdc1cefa4706fb8bd5cda66478",
+   "c40de6c4eb8154963fd973c50f74eecbc09a7cfa",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html": [
-   "bcf76c25fd8da5218e1f7e52b5b0de11d59272ff",
+   "0165e20a4625231fda8d03ff7aaf039ac9a987e4",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-   "2e84896965d0ff1e6400ee75f4a02c2e6093f2ba",
+   "69cdca24b41182991145e46a0ace06ca6699bb4d",
    "testharness"
   ],
   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
@@ -28385,15 +28394,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "a73ecfe4cbaf3b99c74a624294e898ebbe8a07a3",
+   "e685437055852edfbba2dada770cd788a47b183e",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "88535c6734460e1357f29669645be9316937640e",
+   "94196bc1d8e05ae22dd6e98c5c4734a1bc891220",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "91d014708cc029423f946e91f54b87dca2ef226d",
+   "ecc4e6026a875a7c4267eb4bc5bf0a4c94cacaaf",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -28421,15 +28430,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "e7452254b8aacb97e60cff8b69c4a5419c5e2ea7",
+   "859af5115e1695c4f507d543646dd8dca805c79e",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "e9842d33f4a1030399882a561de764c26277d8dc",
+   "6b0b0d336a75cb00ee083e8df7035880d94c679e",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "ccbdf03481e0bbe43b831c778f7ec17e8c278971",
+   "813759b11abe929da240a0247648b4520e0534b6",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -28457,15 +28466,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "23130a7025261828e7f5762e989311167ff29930",
+   "35c008a3cfda9f61f3fbb724eef206184a9259a4",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "4782c023d25962b5a0e20ffc82c189f1102b10ed",
+   "b88439edae3507f27b763396544168688313ebf6",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "10e0f0937d616f4aa5fd1536f501e16e8b20b3b1",
+   "008468ceda7be82f6e5731d24485ead5e7e6c445",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -28493,15 +28502,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "2eee5a67a351827f9ceed703a14997e5d7fa25b9",
+   "ffa0de439871c6634891b7fc90c06744096cb9b1",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "b5291dc3dffe1bd2254816ac6c6b2f6c0b72880d",
+   "1ccee9bedd5e0fa6bdbc5ddde2e1dd12428ec13c",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "c335e2155a60d61f044cecc3ba762864184e6bee",
+   "d881c2d1eb07e72004fef4cdadbad55292462b8b",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -28529,7 +28538,7 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "3b62deae5866c06b826ff3a6402bfac18cb0532e",
+   "12b11ed51a6b5c16860288e57ff02e4e62358b97",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -28537,7 +28546,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "18063f506df0c109a833c692d1e83d2d700f65a3",
+   "c0f5678d9bb6e13af30d38eb3432bdd580536393",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.headers": [
@@ -28545,7 +28554,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "8a00e90284cb1aa815fc9a4a50a3e2c3365b7181",
+   "071602e921a9b68376ca6d01e712f3227b219345",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -28553,7 +28562,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "b7597fa859aa3ab572bffe27d3cf61fb225ef61e",
+   "1b38bded4e021ae5d7ad40396014ff95b4dc4f39",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -28561,7 +28570,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "6a0ac7b241937fda4689aa1ca6567bd8ba446527",
+   "ba0f14c57174caf6de210892b2a9675fa2694a7e",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers": [
@@ -28569,7 +28578,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "7de4d553980e49984e7a907944c6edfb5c5c27a7",
+   "4fc846928c10fde1aac29c58ddab8beee9afa70a",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -28577,7 +28586,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "e056a96816dd4c6de6aa5329b2d96a3534415ab1",
+   "fad7214577f14bdc4b145dc2ce3677abd0a625e3",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -28585,7 +28594,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "2151ed6cca5bec230214ccc1c3690db4c64f157a",
+   "46f94a3195bdf785d98336c77592e2f37d7fea5e",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html.headers": [
@@ -28593,7 +28602,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "9d43f2d9bf70dd539ea1da851155237036bb66b7",
+   "cee37aed84c12b80d3c824ca8517a711a11fdd0a",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -28601,7 +28610,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "fd76a1b34c3e4026ba85868d70fe65ab498639fb",
+   "80b0be4971320a63b8bb8f6933287bca7f08bcf4",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -28609,7 +28618,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "2d0bbb83f4797f90d878ad49f295055fe0c168ab",
+   "c6936815c0c8687b7a1bfc4e420e90c5cc1fd2c5",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.headers": [
@@ -28617,7 +28626,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "3ccd2f6d01662fa6d762eb9fb92eb96fd2a2e0e3",
+   "ae65b0617b7dbbcdf0b655e40dc8ea704dfe53a3",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -28625,7 +28634,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "cae85a4488d7a91f0ceb05f331ded78fd25a324d",
+   "210e1b62108ff74b1548c9c25662f284894f2fb2",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -28633,7 +28642,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "ab985bbd50bba172fd413d99c2c49a7d6c132126",
+   "e8b21913405a5b6e2ad387db14978c1c93dcbbd0",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers": [
@@ -28641,7 +28650,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "99825ffd3705d3d2904acb72d637925c4265ffec",
+   "5f83bc9e49f27d28a1538e49f0cc78d7996ca588",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -28649,7 +28658,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "1c6815bcb239f583b6981dce7e2cb21cc363f863",
+   "a3574c4b934e7efd28f41bf0d2a50d8b384ce71a",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -28657,7 +28666,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "93f8ee40982790bbb94ee1dd8dccecbbb2b49059",
+   "9a41033c042a478aec701963a12e978bfe65f373",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.headers": [
@@ -28665,7 +28674,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "efae4bc3e1affa645d07736e1508f47118388621",
+   "7634a779f8a3a016b271037d62bb2353d195029b",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -28673,7 +28682,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "33cc3b9154e3f8813db5ceaa82e2e40428462ec5",
+   "dc2956e33fad10c4723ee8e08df32377a32be008",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -28681,7 +28690,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "fcb8fd7b15fc011c59ef2c42b8ce5825a1680066",
+   "e0282db4df82ad722eceeaad787670a4b770a46d",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html.headers": [
@@ -28689,7 +28698,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "075ee192a9ac224ea6dc7bb12dfc20ecf8aaa4c3",
+   "ba51ebf89cb5673e920d12a57d7cb30123dc92ac",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -28697,7 +28706,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "90a44332aab80266112843b3a9025b1eb0ac54f9",
+   "43bc0f62ae69bf4c1294bd1e8d6ca6125937c149",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -28705,7 +28714,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "023c65738e81e1b05b098bb3b080458e11ad8b94",
+   "7c274f5a05bbe5dc139d7eb3b9c69865e1ab7c4a",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers": [
@@ -28713,7 +28722,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "c0e4728234109d4f04248d56ee3e0d822e166aed",
+   "fc31c27de52082c91046a7048350dca8d01450ac",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -28721,7 +28730,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "9a4e3d0eb70f15e1f6090443cd0e59fde74f2465",
+   "0c2e08c429fe447e3fc413a5ff4a4075384a71ff",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -28729,7 +28738,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "dbb8226975595db54b35c2b482b3c679c3272155",
+   "897d86ed79d27d424e67e307bdafeb59140262a3",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html.headers": [
@@ -28737,7 +28746,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "a69db0d2d38076a02780d42263f23ae2bb7d1ff5",
+   "ce31440a1446e8047e32b6103ca1863d32332e62",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -28745,7 +28754,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "15024871740841bb5cc4938f443803a025b0c88d",
+   "b6a4318ea9475bd5900f77720b7bc98d27cb2d11",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -28753,7 +28762,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "a8a32fadad2672a303b88ddc8b8ecd34da9f6d75",
+   "5e5f41008c17f95625837737818adb098ee5fb69",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.headers": [
@@ -28761,7 +28770,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "0d3294caecfb4765e221d7dc878e45fbd746833d",
+   "cdbe41bece4df05769c4102766eded2d97adb387",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -28769,7 +28778,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "dbba71ff7f742ae94cd9557420b95cceb6503fb8",
+   "3925e5bc083b654d2ffef6ea3a71192e68f3df9c",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -28777,7 +28786,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "4f1cf38bdef78f6e37995f3a9b680a69887dd198",
+   "2f4abdc95e73068a379ecf3026628f1dfd119bd3",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers": [
@@ -28785,7 +28794,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "263ed1acd5b0502255ef597e71d3ea900af81f11",
+   "9f94db8314508049290f64aad09f1941015840a8",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -28793,7 +28802,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "592fdb9cd4a815d1665d2a3d14cf8d927647da3a",
+   "6f8d0608aa20ba3b3f37582eb8bc3c42858e53b9",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -28801,7 +28810,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "1380777e81a9eeabfeb03f1d662d8a583fbcc46f",
+   "d3d5e4ed7fc9e19a5804849c1f7f344bab66af93",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.headers": [
@@ -28809,7 +28818,7 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "c009b61027ba677917cdba2b3a91a901b4238153",
+   "926c180a4d485b1743bf619bc10e6566af3ac6b3",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -28817,15 +28826,15 @@
    "support"
   ],
   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "cf4bf359a3a37daa2519a14dd25234efa261362c",
+   "027de30ba46724cc6820130b8bb249152bc6eca1",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "c7dd6cb23e812bbc84c4dfda6cfff9ab2fcf1fa4",
+   "a2143c43add0d116474072fd4facea6878358e94",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "86f5e55af8c0b0030afc0abd6b106b69f4047c7a",
+   "045ae1c7674f2693acc64362943a7382bd9524ec",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -28853,15 +28862,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "cb17758c9141c9c62799e268a939ed7a3ce532df",
+   "76f4ab97ab61f227f1d65f93543953ab01d46f1d",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "0eacbba013b15f3f1e48938220fdcfd31fd96a55",
+   "324b7679d6ccde12e5b54a7124f162316a3cd178",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "21de72bab8863d32915f6155cc9cb8c9ce41d8a5",
+   "824f4e7aeacac7a81fbdeeffc0188f64d8f2e16c",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -28889,15 +28898,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "9c4331c671c1f63c3c6c5191b1794b47f375c3ce",
+   "807361b2935bf43e0f91ed67c32ce3499cfd4012",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "a105bea698f752e295024ecf5e9964eaba809009",
+   "eeec31b713ed1dc7c00db0c9f2a0047327f91e3b",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "e576000940d3af2406c4ffe2160f08743a501bca",
+   "61a7341802d985e315c934da05bfcb3e15e5cf61",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -28925,15 +28934,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "4762a30d5e73c239b19f29173fe9c3df20fe7a47",
+   "d17b31a197e43bfcae2e9579c10128d3fcef80e0",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "7ea8f237dd140ab91b55fe33a12451610bb739ad",
+   "5f96f1478ba6b4fa0ba85a917cb8c68cc9db79ca",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "bd3ad7eaae554913d814033bd6f288b9119399ef",
+   "0beccb499397e29a66e16ee9604b9805f2ab0e7b",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -28961,15 +28970,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "099b236af200de76e1ee384ba96ec6fba5e2dbb0",
+   "f1718c88b4e230ff458552f3eeb728a11dbe6f30",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "5b1629c90d9eef2762026cae6a42d14709fec5c1",
+   "8061c04e24142866bba29f93eed4b77fe72cd2a9",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "9f086aa0810cf9f206c005c7061009321ddbc2e6",
+   "b1fc96dd575daaa3e11c8ee0d0570910efa3b40d",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -28997,15 +29006,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "b80c5c13d293dbeebb64571b4f24b9e8b1adeb60",
+   "35b13d9cad684684f74d12164a96fb7834f08aab",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "84e80e9a307f870fdfa4a069f327ca9ab51b5069",
+   "3df7282b584aa044f96bb95b9049012e0e75f185",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "66032a35102310509709f27c44d79f330ec00d43",
+   "32a03d6b01ec7cd16297a0174713ffc76754a99b",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -29033,15 +29042,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "54b5f09bf3107a7336ce6b8eb214ee4aa0e3b21d",
+   "ad9b4e6ad83bda92df61d79b1b8a81780a6fc0f6",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "536a6901c11f5c3b7846925ec537453eac820f79",
+   "d5cbd09746263cc032eb44aa8180064e9596e60c",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "c5796401f7de4c6c6c2f12182d5df640c39d918a",
+   "48158751b1af633341dbb68d993899c1297503ac",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -29069,15 +29078,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "c9e2782b06e1394ec28c5a8ed4347552e4302b43",
+   "d515d091b2e8b4b26c2a156376d258f62ffcd6a9",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "79f7cbac772c2a8dc0a22cc037691fd3b8781acd",
+   "32fe1a4deb756631c5024cd2c231960cebd4c0ee",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "d7e9d9954ee4ef7a5b858cfebc9ad9af0a6aeed8",
+   "b49765d289c76249244e00fbdaa1e8e6bc7a28c2",
    "testharness"
   ],
   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -29105,15 +29114,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "9f7ea1c8bb07da5d103017073ec63aa40d00765d",
+   "d65b6b7fcc91690eef7ee6d5072799a07b679d95",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-   "459d0acd14718bfedd544e16db4e3a650fd24fcc",
+   "6ed2f299379e03c87583eb447e927341d8f77f2b",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "dad86eb41e2d36f6189af9d74e0933e0b598b5bc",
+   "f5cd7a19e6e023503a166af7ea93a02dbe8e082c",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
@@ -29141,15 +29150,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "6e41320383186ff9b78b4f13b1f0d062a021ac2c",
+   "515a55b4318c2bdbee3a6eac03bf8fe63191bc9d",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-   "acd14ed16c72a170f2bceb0200eac8f0631cd7ff",
+   "508214df8263f592c0a1114ee3680acf00d65bdb",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "7a6f0979bd76e7d42985f6a7eb9c5405c90cfa4c",
+   "3abc5cf8aefadb52ca4606089f48b7deb58b3497",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
@@ -29177,15 +29186,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "1babbf716be426e0077a639031730206b7ec4d34",
+   "3a232b18b8088dc97d86fa677aa3d4a45a95380e",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-   "08b448053c1d16fc67e5716477e38d58f9dd8cda",
+   "9b2df5976195493e931b5dbe39f310ab3f95889e",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "10ab591e86b45b0724cc11d24b20f5d143a26fa5",
+   "0690cd69a1bd64848557d864d586d257eb168da8",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
@@ -29213,7 +29222,7 @@
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "9049ceffdb4ceec5bf9955fba97a03c3c5aeb844",
+   "727f6b5093ed5dc668b62ee49af1f9c413019211",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
@@ -29225,7 +29234,7 @@
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "9d6f298a611fd7c17e6396272b6fc090cca87181",
+   "62d0c3cddab99998758f9b93c594e2825ab72d95",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.headers": [
@@ -29233,7 +29242,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-   "f2ae2bb8f76540f620448766a72dcf830a28203f",
+   "bda67dcd733a93d3b5689b9c8c5cb9b2b4739f9e",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.headers": [
@@ -29241,7 +29250,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "cfea04f3864699116d5f4e9974c74aabe5190ee8",
+   "3867b88d56aa15dc237c178fff572ea291a5aa50",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.headers": [
@@ -29249,7 +29258,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "c5dfea1ebc0da1c12f2ca45f917f68cb3f0f43fb",
+   "531589f61c74bb969876b4df6441aa0c5fd19edf",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers": [
@@ -29257,7 +29266,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html": [
-   "32eaaa28a90636a5f5140e48212bc1cd2782d487",
+   "387e4daaee2b27995dac0cbbc10bdd12ac4af210",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers": [
@@ -29265,7 +29274,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "18abf2ab97e4472ce2d6b85c8b16830b71628a56",
+   "794cc29dcba13e85c1a2509405455fddcecc520f",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers": [
@@ -29273,7 +29282,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "0eabd21f0875d68d59a723790f87f92570a20155",
+   "ceafd797dfd62a97e28b5a8e04361bbf345d843d",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html.headers": [
@@ -29281,7 +29290,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html": [
-   "63f1bf7d73665ebf30092f2b51e91fa1f8950e75",
+   "c77f12d0248485dcbe9b32be7c563d0f2ec2a676",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html.headers": [
@@ -29289,7 +29298,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "753dc472ddc2569497b3140c500c25b020b512bb",
+   "13bd407be6d6bcf2a2059d7d22a59065df4b1351",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html.headers": [
@@ -29297,7 +29306,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "457c78e068e16b965ac712b6400fad541fd2ba2a",
+   "00dfc00bd80f65de3956426e6d8445fc0fde607e",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.headers": [
@@ -29305,7 +29314,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-   "ff06707a43643f861f3badb089576ff50ac9cf0a",
+   "b833c3c0b1e1f3520d6560411ae4dc8b99c79268",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.headers": [
@@ -29313,7 +29322,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "cc0607309fd9a6f1c2979c05358f4705076f35d6",
+   "f1810137760a943ffd5c22f2fc470756309c820b",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.headers": [
@@ -29321,7 +29330,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "54f2abc8fc98d996ea015991c82ad8dbbc03a6f4",
+   "51c80392a196fa02137f4992d3d9ee14e0e6bbfb",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers": [
@@ -29329,7 +29338,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html": [
-   "bed63c9eb1f42932b1c6dfc5920ee3255bb5ea5c",
+   "9e0b720cb7ef2968817addaa47eb7ecedc64b09f",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers": [
@@ -29337,7 +29346,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "3ec1f70245f1c12e1d5c59b5b0057c720ee67f61",
+   "1e5e0207b4d327a6c3603c643ca427f7a55cf65b",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers": [
@@ -29345,7 +29354,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "09846b172b297650d649b640322f8939a83d845d",
+   "b56c47f5bc10e402a8ce79f07edd6cadd2989b02",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.headers": [
@@ -29353,7 +29362,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html": [
-   "7a6a461562f731e0bf318622e52675b4cabd8c7f",
+   "1998fbee0fb101d96c8e88095e17bcf700478ca9",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.headers": [
@@ -29361,7 +29370,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "003b25f0275eccaefe6e1bf09d236b79c8d221b8",
+   "1715b323d698540fcf71e3c8a2caafd47a798eec",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.headers": [
@@ -29369,7 +29378,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "3bd60f77478ff0f952ec5866d34f78d6c3ef77f8",
+   "b8c3947a77a65df715677686db95ee9542c7d53a",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html.headers": [
@@ -29377,7 +29386,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-   "7db352ce31f135dc34a0299e2e0373104c13c91d",
+   "aff8eb9d40424cd3670051ab4588ccfb6c296881",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html.headers": [
@@ -29385,7 +29394,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "914f891244f8a5596f93cecc99ff107cf120ed30",
+   "4c9ba50dafd580b43ab8566432a384b7cd6dd3b7",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
@@ -29393,7 +29402,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "a42184bc85ed64dc794dfdb09e4fc7fa8991e47d",
+   "32d6790c8a93e54cbd3c819333964ede258a45c2",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers": [
@@ -29401,7 +29410,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html": [
-   "d988237889628d2e7bc39c24a0da4e1d8bd77166",
+   "529c29448b509fad83e9cd7f78c26e60df7c168e",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers": [
@@ -29409,7 +29418,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "4daea9d1d768e206c3e5d067a942a0f414e299ef",
+   "4741f06136bbae65aefc09d1d0046f946b072e1c",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
@@ -29417,7 +29426,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "fdec875b8b34705f16f3e707c010b6da219fdc53",
+   "073efbc5275c4428e405df4463dffa640b24ba9e",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html.headers": [
@@ -29425,7 +29434,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html": [
-   "be48c99881c9332273d6e7191c09d2501dd02f50",
+   "70e27f213722ea9ce023e887f2338d7641e3d172",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html.headers": [
@@ -29433,7 +29442,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "8889e24eb93b147a63389f3fddda554a24606157",
+   "b04d3df2f4ffff469810b2a5ea24c026d5705bd1",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
@@ -29441,7 +29450,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "88f2a2e50ed401a0153971e454b28cf398fcf4fe",
+   "3059cf0907418453f174b34ea39af7067529f91b",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
@@ -29449,7 +29458,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "6eca44d7990471c6877622401b70f67cad70df5f",
+   "c485e04a03e85e5a75a5e4d26395ac10189aa455",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
@@ -29457,7 +29466,7 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "ace588a4351fedefdeb906a2b4e27fb07b67d810",
+   "3904619306416f85c32dcf077a88bd65bd7c2d9c",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
@@ -29465,15 +29474,15 @@
    "support"
   ],
   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "b85a719aaeab356d5d680f0968a4c99b482e7710",
+   "f24bec748458cf47080c2a5ad8e639bdadf93ff8",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-   "f9fefa28a9a1868365d0cf8f118e34693417b562",
+   "14d0021de5c9470cb17dfc81297d948a381f8d97",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "81d98cfe79248f58e2dc4e69c0c2fdde1a0709ff",
+   "aa25c2404d55d98d381761111d6b8afbbcb41f7a",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
@@ -29501,15 +29510,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "af29607e88cc22dccda682f679a9d59a4f265876",
+   "dad5eb64d2dffcac27bd3cf27e4b996c2fe17d92",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-   "21030995ab867080194b96cc9697c51fb0edcc7a",
+   "5419e4f30527693bb52333161b7ab1d6dbaae4fc",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "89388693624a12744df313b151a206cf81d461c9",
+   "6e1075620e63b0362cf5f2e2c6212aefeedc7b18",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
@@ -29537,15 +29546,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "e471c68163a631861a838ed8dddf954d3ebf3924",
+   "ce39f24ceca5398c2f98d884703b5041bbe8fd82",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-   "8d67c443da3879ac6827f4f6cbad464e66393f5a",
+   "d7a9b79d1f333e0406088810108eaa46b467e674",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "9b08c14c16acccb78e9a2531b92a84d116c2e690",
+   "66b6bf2f3ece1c1579ead0041f5d81550ec63202",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
@@ -29573,7 +29582,7 @@
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "effc98b5981860db616c147ea8ba0c916086be4c",
+   "66ef3d8b620174aefd3f5730f19d46839226424c",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
@@ -29585,15 +29594,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "495c67d29161c45df5e472746dee2bd3d81f4f52",
+   "18faacddd832bafd981607e67e2b4134b132f467",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-   "6c3322e8bb0690bfa788988cab8c7115a55dd4fe",
+   "dc64b4a5e9a00cf282ec2ea8d53ecb53a4e0b833",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "469a55315455c56c4f155582131f7f81111c9b9d",
+   "957393bfdb9da6b17e7dbfd373b7e1b545584d43",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
@@ -29621,15 +29630,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "145680075283c13fb47219d799627c4a192378ad",
+   "ae3ca6b1f0d294c33c3feeaf9e8c4de5fbfa6c49",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-   "8f607b90a6122b19f7f7cd79e43a9853afbae00b",
+   "48e93cad3c379a58868b1cd688a822d77dd17e50",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "3bc57e2c8320b3781894ff2918be3730934c16a7",
+   "4208e764a22840ad0ecd73a530815eee9bafb487",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
@@ -29657,15 +29666,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "c11ba2060d9b51c7cc46a0162dcafb49e34b3e6f",
+   "b265fc7838d39553ffbd0d52a0245db55caf1aba",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-   "7128c274436fb8f215d636bb13642a587919d2b3",
+   "daa0d2158e9eaec9b597030eb730bcad41ac1b05",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "e12eda52550f92473684d6101e06f7d9d20d66de",
+   "08f8f682101025863cece63dcd3df2297a0f56ee",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
@@ -29693,7 +29702,7 @@
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "2d30ebfaeacaf7660e22d3d901a5f2116399a7b3",
+   "c37f5e1f51fc8b0bf1ce59ff9d11f3081e69365a",
    "testharness"
   ],
   "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
@@ -29705,23 +29714,23 @@
    "testharness"
   ],
   "mozilla/referrer-policy/spec.src.json": [
-   "827688846fd51b8af7c82e1bfe2a6855abc3a15b",
+   "80496de7117dfe9f83b75068585e93e59be21e0a",
    "support"
   ],
   "mozilla/referrer-policy/spec_json.js": [
-   "bf44dcb68cc3a0587cc0e46e9b4aeaa9d9d81836",
+   "1ecb6e7d86d4f97fa849ead83425d002167ad5e0",
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "08cbaf26a4d3e50f617ace78628ec82d2d0f0b62",
+   "bbf408cf7ced1c084ebede148672b727432f900d",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "f536d67e18d065e4948e8ba4f45f4867b80f3bb4",
+   "2b0339edba33766f1851060133586e72406f71da",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "36d149764ba485be2fdf18099972cbff57f73cc0",
+   "6a2881e98673d0697e9b8b90ccb283eba1fc6da0",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -29749,15 +29758,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "a03a2a167ea9a220fc9f89544eea767dabdb014c",
+   "56e0593ccac4059cd6eb1b2a26b8c785089e916c",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "f3374da219353a4d455603b29e4cb36bb564376c",
+   "d3aad120ece9ac1c7cbd25bfa78dc5c35a192d32",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "46e700da732a272edce393612146b674d0b39662",
+   "d78fd8a56740ad11fc8b790d1e5362e9290a0912",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -29785,15 +29794,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "8adb9c16085e65d7c106b788a59a1cec041dc403",
+   "50cf647111e484b61e475f25d0edb36acfb50ab1",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "3154580e74419c3a73c9d5c1ebbe7845248d4409",
+   "ef1d279e2d9450d3d8b17653429664b81ac6d8e9",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "b455dc07a82f3c66686593616908e19f6ab62cbd",
+   "7785a957cb1a6168801532c9c45191eb88e9a5a5",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -29821,15 +29830,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "d5f815351bc548b4a315d07068b0625705f9929c",
+   "18eebd79a9f0cda0a14d38861cfd8fe5956ec531",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "a965e5ca77aa17528f8d2740691c360af8233816",
+   "25f69fca42c5f54787ce2dff05f9cde8614c64a6",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "0aab0652e5c1d2f4e3d2502bcd6bc6c9f9336b5f",
+   "ab3ee0fd8536d96d9944d05ead104eb45d15937a",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -29857,7 +29866,7 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "d3ed573779923df49f5372a7c5800d43ff0dad09",
+   "e064a29a57ea45f6474ec29774d71e742f9fb75a",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -29865,7 +29874,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "97ac7d4df7cb12f501fc5087b9505a650255ed1b",
+   "4150670a862b68ac8a9ff0ef12828ff787557d42",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.headers": [
@@ -29873,7 +29882,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "4adfe7320de80be09650c63d5692e341bf4a158a",
+   "28412cf23763a354d91bd681287ce6ab041c7dc2",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -29881,7 +29890,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "8e811eb8d293f0fa90e223c9da8068ce622bb0b9",
+   "34997d9ea1c66f69120bd3eb33afbb7707f60a43",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -29889,7 +29898,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "573601e518cb5f6b2522e22c2960472168003c76",
+   "5353e9913daac6d1cefb45cbe384315448bf4ce0",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers": [
@@ -29897,7 +29906,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "294906990bcf58b5f0d4220013c6f93457b76fc9",
+   "d4b4a1121015773ff85566ab79d8dbab9c7f6d1e",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -29905,7 +29914,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "d3dd33a5321120287dbdbffe2abb320cc296d7b8",
+   "a006d7412286609b6801b6cc065752103088992b",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -29913,7 +29922,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "3ef297554770402b0173bbda2e22aab7035652ec",
+   "05de9892c6215694dbe2a5e0bc032cb63a9815ad",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html.headers": [
@@ -29921,7 +29930,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "e6e240f488f29c78242a43b71e167651cb4e353e",
+   "d494fd1425f3b256e36cac366a78759c4568fec4",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -29929,7 +29938,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "7accc789259d97191f8bfb63fecefd4b13bd9318",
+   "829f0d45de5ba00bd8da7e6d8b82ddcd12c1c945",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -29937,7 +29946,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "daedccb6a18e364e56360600c254a646339aa5e9",
+   "121dded6024fa50e0c4cba2ca824eebfb1b7b8cd",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.headers": [
@@ -29945,7 +29954,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "935613a72284ec7ab004bb66604360067e7cc012",
+   "d7309ab16388448d787984a2a1ae7eff9cd3cd6b",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -29953,7 +29962,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "316d01807bcf63431f6e2bcc84d0d2bfdf187e68",
+   "e56bfec93251962fcb0efc18bec09ec498b0501f",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -29961,7 +29970,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "865ce6e7726c53898a360932482ed786ea383606",
+   "b27187b0f88588f221978589b09758bcace1c10f",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers": [
@@ -29969,7 +29978,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "261a934c23356f0e02f047af3034390eef1867ca",
+   "d1dbb45807b187eceb654ccffd3d55c2c9ab6591",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -29977,7 +29986,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "40ce1bc9a4e4d79fa2ee549d4b982c03f382b97d",
+   "def7265300d1063d6db5ad7f87550f3b8fc9d53a",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -29985,7 +29994,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "1f726ffa01af3e81c06c1c65aedead0aa979a9b8",
+   "72ba43302e5a490784cd48fa0f509577970ce3b9",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.headers": [
@@ -29993,7 +30002,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "0b7bfcdb612b2e187eaf5fd1c50337bd25544edb",
+   "b6eb9c185069668ccab445b31046dae542aecd0d",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -30001,7 +30010,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "5e0d50bffd6be81b8d729d35af1e91d0e2092b26",
+   "b2882868e68bdce8bdcd9df798bed2550b15c951",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -30009,7 +30018,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "b60e8a84ad699ab34d15969b447011a9203436a6",
+   "ff27f2c507e1ab0aacb11c0d2dbef7a195210a45",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html.headers": [
@@ -30017,7 +30026,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "19dd4c2d1ba3a7e0cd0652f8afe4332a6b1d31f6",
+   "3b502224fdd543a2547c4d8184bd20018a573446",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -30025,7 +30034,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "615e58fc6ce7866452a136bbed795a60d27fa85f",
+   "80cff995b2781842f1e70046d541285afa09b042",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -30033,7 +30042,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "cbf6cd7d432bcfe316ab705c59e1cab1aaf63315",
+   "dd77737b509d3fdcc84b5e649dc2e7a7bfd646e7",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers": [
@@ -30041,7 +30050,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "b5ed1d1afe820d641b2c110e97cc3769161af028",
+   "8ec0256421783621d62dfdd54a7f94e373c2150b",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -30049,7 +30058,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "8ba026e1899bb7aad18b15dec0b2a334c2fb563a",
+   "4ef0e2adc1d1350f7e3ccd6acdc72ab6412fb377",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -30057,7 +30066,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "3cbc372c8296c011c40253a5eeccc8031d412937",
+   "dc25affa609f77f3f73b3524fac450aa7bb423bb",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html.headers": [
@@ -30065,7 +30074,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "658c85d7de0da224c66abf57113b074edc03ea89",
+   "78cc910298ab05ec57ca06c9e8b553f556f7a9db",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -30073,7 +30082,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "34e4a59a5646f76515a95bfd7e74c9856e293466",
+   "fe7bf3657e7b87857061443725b1f32bc916b0bf",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -30081,7 +30090,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "5e3ef0c8d4bd4ab3a617302363c3326323ea1ab6",
+   "62ae227f06c5288744784504807907ecc1a846a3",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.headers": [
@@ -30089,7 +30098,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "86df5a1fcd8ff5cd17ef52b03871518b5c3446cb",
+   "f98124c53a6f1700687677c8375e6e37c4425569",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -30097,7 +30106,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "54af2cceabb6417705ef376b5487c5d4e46b7cbb",
+   "8b46e21fb345603c3e0f3c0ab24b253dbb562e19",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -30105,7 +30114,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "2f4e28c47614848f1c8943da52de007fb2bdaae8",
+   "e943d48b0c8613b4aff06ddd1356f040b44c4d9e",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers": [
@@ -30113,7 +30122,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "fefd25580fa9449b3e23770ab22180e9f5cff9c3",
+   "aef97d377febac7fe5c39dbbfc75dd897e815372",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -30121,7 +30130,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "eca2dca9d2f39eba58ea956cdc5657c48689da17",
+   "e3a1b6a0988a312bb1b8cb3cf7190f817843eb96",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers": [
@@ -30129,7 +30138,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "fc9f276e08b17950d78502e95fcdf22f5d610c64",
+   "a389e85f97a02306c337027593ea482e57e48fc1",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.headers": [
@@ -30137,7 +30146,7 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "436cfedbbc2c04e3e3c72e772409227731a69d7b",
+   "77019d54416a93777466d416b0cc17d2a0542f8d",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers": [
@@ -30145,15 +30154,15 @@
    "support"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "5a97474a75c9835de99879b10254cfd70cfa7476",
+   "9b5373aa9f1ed9a46479a2429512358422668f8a",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "f9e398f44e1ac685eabe87aedce0d0cec87e6a4d",
+   "4154e17b25e1863dc795733c0a6609a705021a7d",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "4e23bd7b8dc124e387c9f0dc36416bd747f7612c",
+   "35d8af2af99f894b828e3b002caac7d0f0c4892b",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -30181,15 +30190,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "028db88485be159e9e52555f2a2f44ed7ca2750c",
+   "d2d174602e9c51358d92d87f1cbb913ac7eaa426",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "5e146d40b5927da20badd15f1adb6d4374129801",
+   "8590c54686bd86ad41c8178c9e67ae6c94416a48",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "fef5dfff16aa234c649aabc3585ca1aa9709dd4f",
+   "97f847436175a0561361625c31df2c67166f20a7",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -30217,15 +30226,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "e12da3a842309534e6a838ff9a028fd4f7acb396",
+   "4e4a0381431c8f2de675da467c70cc6828c0121e",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "fc2c07b194eaa48775ade7de7798a88398d491d9",
+   "e1e530e8b48535c47775f276e631a0da45dd24b9",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "1f3fa71927b95c60dca6e25512be54ba2600d836",
+   "c7c400f6617876000352a418eb3d34d4c1cb7761",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -30253,15 +30262,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "d122a0b2019341716de566ce333e143c0b35250a",
+   "9c3211bc8292f0686970c4d747ebe74b5dcf4959",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "1ab37ecd4e25fa4ab55502da6c322d455985fa9a",
+   "356e7c95feaf1086e0ec3425fecfec15dbf9ffd3",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "f0fc160aa42df6cf7b6496c998b3a242203a60e4",
+   "0f71369780c8ad86d68c493859920bfc27a39cd4",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -30289,15 +30298,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "50ec8f173e4ceee452cdd77fb8eb84d3821d8feb",
+   "52649f365161f54cc60e44d5ec30cd3125433ef6",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "ef3e1623c872440c5990e5c88b1eab80f5cb6eb6",
+   "9b197cee777e94e6e7876e8b1d588b99af5fdaf3",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "d94f13d062547433781f058ec6b6b75eb48c2b4f",
+   "d1cea06da9f604dd46c4bc0b32109e031eebac46",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -30325,15 +30334,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "3b57b2ddc39f6198721294b45c6216e5055d743a",
+   "8c57f45c4121ed04ff6aba774ea1fcc0859c64bf",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "0b932af267fa9f52d803509b82b38398e19159f5",
+   "02014d2ba211a6622c55a7fc495252a4429e87e6",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "a49ab7f98a591c3dd8a1d74d9773055ab117a92e",
+   "dabe468436fc080be18c4c744810e6e604ac99f1",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -30361,15 +30370,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "77e496559c149f4f3a28914cfe8386cdf6840aa8",
+   "b675522cb41a0076260932eecd7a1bfd64bd7df6",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "314ae663b8ef0552c33fed21ae3270cb56c0c6e0",
+   "e737a3ca0fc46f088848484fd3cefa08d16254c5",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "641f063fcabceac7bca6be70e4bc912aa17a0596",
+   "280ab3d0cb854d341fc131036933609a205b1fa6",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -30397,15 +30406,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "f19c72c7b6dcadbec316bf56fbc69ec9fc30e295",
+   "e7c5be622b45d5b97fafad9f879a41760939b6cb",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "f04b424f1fe0e49594717a3be04822b027aae909",
+   "b5d629a29abbc03f2ee3409656e54761340b6994",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "681795a22f0e080d6d2ae897cece46bca435b38f",
+   "474d48194997ab00eadcda792228f07a9678d73e",
    "testharness"
   ],
   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
@@ -30433,15 +30442,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "190f040c77d826f9a9817d569f3d2d9bc9f31630",
+   "ede7d8580cb66d5cd9c2c4fd694f9a364d055908",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "f2c64755fcd026094df42ffa05301438dc53bbb1",
+   "0dab18dbb7a76488ed660810aa55000b25096c28",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "1ce12796b5fda0006ce3b2bc99b0e4ada0caf432",
+   "0f26cb945220745f1a4822f97f998573cee65f61",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
@@ -30469,15 +30478,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "f6061a16b5b3f0f35e855934587afdb0c1079d0e",
+   "3e5eb22da720dd989db003da044b5253dbd2596c",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "4b6d7f22a606e3d6b38325a7b53d89a6ed7c7502",
+   "cd37a4f0742f259b35efc76d98d9c2e0ddce3195",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "6f43679e41b85f3098b619be5a5e221324a9e90b",
+   "a1eb442b8d0e40a6d61ec43a8a724ba143332ecd",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
@@ -30505,15 +30514,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "8f2b9ee81fea559036dfcdf5c2b7ca7231e9134d",
+   "c3135f7fd7cdd2fd5c6ed87971e261a41b117b9c",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "20c5697e9743f678f9ca3349b2864ea09843a793",
+   "ba6f8314b346e4bc97e21120164a77ff8008e6a2",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "37ca6b5fe926a29b1ce7f8b9151eae1cf43994a9",
+   "63460357b2d79dbc35d66861c0cdf7dafef14a5f",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
@@ -30541,15 +30550,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "13d92afeab50ad264c4f86185dbc1659d76ff938",
+   "1c5809b1fc7fbb159620d0fb5e69bb01dec9c9c2",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "829f997291849806df0fa05ed3943859d387a92a",
+   "bde56cc005ed82b49c9583eb83edbe20f103f37a",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "c05d9f2b11f600137f9d9e3cb7ea2a2325cd2f06",
+   "0b59eddae139a3c07f3f73729f505fa32b5326d9",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
@@ -30577,15 +30586,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "af84c316d9afc9082157390f932c1947673d1453",
+   "4c5a424b6580f6848cc628d8a429257a4e1a3217",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "670a935352b9d3cab3c806885d614ddc09189b23",
+   "c68a22021e6accc91981c2bc12e54b15cb68c5f6",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "fa504d393a2b0fd7b29f22ff1671659c2caacf3c",
+   "030830e1d45bed55aa90f21ed4ab487cdd20de42",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
@@ -30613,15 +30622,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "0aad567842e3d90708401bcbeac1628b10b77c73",
+   "bd4a83e90b690cd10bd287b67a4898ac143a8559",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "5108f11e8547a83c416a8e248e9aeb4f4475deb8",
+   "389f58f0b3951919edc21982d73725150c476295",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "84e7d8c0d082aea235594792aa472deef9157664",
+   "582b2ba924c8b58c259e4a869d6bbb17f2791ed5",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
@@ -30649,15 +30658,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "3ca6155ba93cd7bd8724ceff090149cc66cb3c94",
+   "f5567602993518ede38bc23b1a878d67d1337fa1",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "47bcd47b75f37843c93aeffa9bab297c300f36d0",
+   "8a21284791ea0294050a2db490be0a4a2a29eefc",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "65899cb8756b55903e8cd5510b4a19c80768621b",
+   "b905c280734bd47924d966ec0652e23a09847c39",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
@@ -30685,15 +30694,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "2ff2c060f1bd9ffef03a290e0bc8a470d1416bd4",
+   "6d64d06287ea414ae89ebf502fbf733cc3fb42d2",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "8877850171b0430dc7d64eba0380f61bc2e2b20e",
+   "7715d8c12578d57b9e513f24644210ef8e6b0c12",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "38717625653200ff3881accf4a9e84fe1f7bc385",
+   "101a2c3c9bf0f3812a51d2ba8e0e2f5500ac7598",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
@@ -30721,15 +30730,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "e7e67de696493146a790537b47ad0157925fea07",
+   "a654651b6996df74500019c4000264bafcf4c5be",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "668c671035019691b186f68a686a4aa2c25ea29c",
+   "cba8f5196534fee2eb85b5a48acfde0c9e3967c2",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "f8eaee1186934bc5de4475355b2d6e865dc55a08",
+   "1d7f3b41e49ab0b156130de03cbd6dbaad1d5019",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
@@ -30757,15 +30766,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "dbcd22bb0932a1db0964dad2e34898cd6ee31caf",
+   "3781f1db0a7f5ff5e3936628d80491ea9dc60340",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "5dcb009a1e76c6f7387eef2f7e5012af71e17d57",
+   "4646dc2b1760009a95c66986521eaa18f5426a10",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "0031dc68a3b18a8646d95716f0de29730f3fa68f",
+   "8c0ae998db26986dedff45ccc190d535a0e969cf",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
@@ -30793,15 +30802,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "e1d13d42caa5e3837a17cb28e26b642e90732bf3",
+   "662c6c61095917fb165da453d36d00d2fb3ff366",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "49bfb263e19af7693b1de54d71cf65ee75284824",
+   "d183ad677a45c4dfa51c8a30351981952a012a1f",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "a96ed76a64c77993f895e217314ab0801d0395bd",
+   "e247e8fc2fa4930a8511893bb0438b073498d0fc",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
@@ -30829,15 +30838,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "47192ea2f79938780ee652d95c5a98684f9d1f1a",
+   "5327cae0673e9b6b0bfa1ca8ecf1d5f4a7b5d2ba",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "bfe2de2c9a789fbf827510db7a6a463b414c6a1c",
+   "96c48c97e1360611a37f8ecd52751a5c2af15812",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "547477727afddf4d2f11bee833db10e8c831edb1",
+   "6909b47a953525a4a424cc88a42924addaf7851c",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
@@ -30865,15 +30874,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "dff20bf1c55eacc38da210764238aa349c48e7cd",
+   "809184c3dc9d25cad7331c34e2a1d84a99f3e0b7",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "4fcbe2100229d4e4c00ce798d862dde2b1a3768e",
+   "ba6068b558d2f7305e174f09089992123b80d141",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "090a7da7ccd6bea5d10051237efb034a2673c698",
+   "90e955cf115392fc89068412e1dcb4c81bed64fc",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
@@ -30901,15 +30910,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "fbdff00553dfb0817d350bfe7124a19ba9704677",
+   "6e4a0680248a2b0fc261c0461a307ae4473013f1",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "cf04ca370e76b217332a5d9985ada30fd5f1225b",
+   "e9ff8833bb12292abfecde9e5284132d30d41eaf",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "43e5136279289000a9d281674e0c127289f04645",
+   "e5f8b0c4c7c3588554693103c498179a6f4f58d7",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
@@ -30937,15 +30946,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "4293814d5de72bf6b9a91545c3abdcdabf26a2d5",
+   "27aa17a4814824d0830f019c5c5cf1b0414b8c15",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "7fbc40eb2a6e7ac69ce88ea9010831f0bff6c56b",
+   "689d609b2c6d78b29826ed851ab2243288783f9e",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "4e05d1756e72b4bb16cf8c068545ea3e89f2c84f",
+   "91200e9a3664a5030981c45a85c314d0e2e1a6f8",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
@@ -30973,15 +30982,15 @@
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "b6b0f8123397fd075a8830bba9867d4b492f459c",
+   "137c4a6a8104c10c94274d5f27eca92bbd364487",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "df605c60c54a80313c9f7b1281bb47ecd3e6c173",
+   "3b86ce2dfdeb4a6e682aa6feb0b05193ae1f89b6",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "72c9ea4d43604a5bf39b3a7e0936c7d731be9402",
+   "d8d0de029df02599f485ee6f1a41f875cb1343f4",
    "testharness"
   ],
   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..33c6e80266f
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.keep-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..456c6cb8be8
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.no-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..aebbc5cf57a
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.swap-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..ae213c58573
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.keep-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..71453efdd9f
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.no-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..d0ab04c47a0
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.swap-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..32ff7aecbf5
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.keep-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..9080eb138c6
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.no-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..492aca64cdf
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.swap-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..83bfd84b592
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.keep-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..57560876cf1
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.no-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..dbb5aa98092
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.swap-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 18655c3a060..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the rel-noreferrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index adbbaac4dd4..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the rel-noreferrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index be4d8aca5ef..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the rel-noreferrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 9ec7834d3b3..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the rel-noreferrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index b5b60714a7b..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the rel-noreferrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index b6899b201b4..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the rel-noreferrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..19222d83da8
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-origin.keep-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.ini
new file mode 100644
index 00000000000..63f187f3f14
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-origin.no-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..1a47490243d
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-origin.swap-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..5757786368a
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-origin-insecure.swap-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..09ed5281c68
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-origin.keep-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.ini
new file mode 100644
index 00000000000..034e22bca06
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-origin.no-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..0cb7671e1de
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-origin.swap-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..d8b81bfeb10
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-origin-insecure.swap-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..fd1811367a5
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.keep-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..1d132b2fdd3
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.no-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..9110bb105b5
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.swap-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..4724f9d5714
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.keep-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c5efb59964d
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.no-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..d8a895a14da
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.swap-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..cf7e1a78cf9
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.keep-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..6ca259b776e
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.no-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..17e009405f6
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.swap-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..1a29577d654
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.keep-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..cfaeaea2c30
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.no-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..3d88cb24b35
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[generic.swap-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..a7d3605c2c6
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-origin.keep-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.ini
new file mode 100644
index 00000000000..2598b6c7d69
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-origin.no-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..2aa5f91c2d1
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-origin.swap-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..1706f501c72
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-origin-insecure.swap-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..f707dfca52a
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-origin.keep-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.ini
new file mode 100644
index 00000000000..8a03e521f7f
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-origin.no-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..ba10bee78f3
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-origin.swap-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..5c4a94fbfe8
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-origin-insecure.swap-origin-redirect.http.html]
+  type: testharness
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/common.js b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/common.js
index c93fad93e8a..6adf59c0c29 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/common.js
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/common.js
@@ -192,7 +192,45 @@ function queryAnchor(url, callback, referrer_policy) {
 
   function doQuery() {
     var id = token();
-    var url_with_params = url + "&id=" + id + "&tagAttrs=" + JSON.stringify(referrer_policy);
+
+    var document_url = new URL(url);
+    var document_protocol = document_url.protocol;
+    var document_host = document_url.host;
+
+    // TODO This is a workaround to pass tests which their referrer policy
+    // changed when source and destination has different protocol or host.
+    //
+    // Here we store url's protocol and host, then make url's protocol and
+    // host equal to window's. Finally, we pass the protocol and host we
+    // stored as url arguments while loading url. So that url knows what
+    // protocol and host to load the actual document.py and makes tests
+    // meaningful and correct.
+    document_url.protocol = window.location.protocol;
+    document_url.host = window.location.host;
+
+    // Due to limitation of current test implementation, we are unable to
+    // capture referrer policy from meta tags and http header of test
+    // harness directly. To overcome it, we extract these information from
+    // meta tags and pass it to url which we're going to load for future
+    // use.
+    var meta_referrer = undefined;
+    var http_referrer = undefined;
+    for (var meta of document.head.querySelectorAll("meta")) {
+      if (meta.name === "referrer") {
+        meta_referrer = meta.content;
+      } else if (meta.name === "http-referrer-policy") {
+        http_referrer = meta.content;
+      }
+    }
+
+    var url_with_params = document_url.toString() +
+      "&id=" + id +
+      "&tagAttrs=" + JSON.stringify(referrer_policy) +
+      "&metaReferrer=" + meta_referrer +
+      "&httpReferrer=" + http_referrer +
+      "&protocol=" + document_protocol +
+      "&host=" + document_host;
+
     var iframe = appendIframeToBody(url_with_params);
     iframe.addEventListener("load", function listener() {
       if ((iframe.contentDocument !== null) &&
@@ -200,14 +238,17 @@ function queryAnchor(url, callback, referrer_policy) {
         return;
       }
 
+      var xhr = new XMLHttpRequest();
+      xhr.open('GET', '/_mozilla/mozilla/referrer-policy/generic/subresource/stash.py?path=a-tag-document-url&id=' + id, false);
+      xhr.send();
+      var expected_url = JSON.parse(xhr.responseText);
+
       var xhr = new XMLHttpRequest();
       xhr.open('GET', '/_mozilla/mozilla/referrer-policy/generic/subresource/stash.py?id=' + id, false);
       xhr.onload = function(e) {
         var server_data = JSON.parse(this.responseText);
-        server_data.referrer = unescape(server_data.referrer);
-        server_data.headers.referer = unescape(server_data.headers.referer);
 
-        callback(server_data, url_with_params);
+        callback(server_data, expected_url);
       };
       xhr.send();
 
@@ -248,15 +289,8 @@ function queryLink(url, callback, referrer_policy) {
     var id = token();
     var link = document.createElement("link");
 
-    if (referrer_policy) {
-      for (var attr in referrer_policy) {
-        // TODO crashed when you assigned value to rel attribute
-        if (attr === "rel") {
-          link.relList.add("noreferrer");
-        } else {
-          link[attr] = referrer_policy[attr];
-        }
-      }
+    for (var attr in referrer_policy) {
+      link[attr] = referrer_policy[attr];
     }
 
     link.href = url + "&id=" + id;
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/referrer-policy-test-case.js b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/referrer-policy-test-case.js
index 7de08b9a554..2d676c40b23 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/referrer-policy-test-case.js
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/referrer-policy-test-case.js
@@ -109,15 +109,26 @@ function ReferrerPolicyTestCase(scenario, testDescription, sanityChecker) {
 
         // Check the reported URL.
         test.step(function() {
+          if (expected_referrer) {
+            expected_referrer = new URL(expected_referrer);
+            if (t._scenario.referrer_url === "omitted") {
+              expected_referrer = undefined;
+            } else if (t._scenario.referrer_url === "origin") {
+              expected_referrer = expected_referrer.origin + "/";
+            } else if (t._scenario.referrer_url === "stripped-referrer") {
+              expected_referrer = stripUrlForUseAsReferrer(expected_referrer.toString());
+            }
+          }
+
+          expected_referrer = expected_referrer || t._expectedReferrerUrl;
+
           assert_equals(result.referrer,
-                        expected_referrer || t._expectedReferrerUrl,
-                        "Reported Referrer URL is '" +
-                        (expected_referrer || t._expectedReferrerUrl) + "'.");
+                        expected_referrer,
+                        "Reported Referrer URL is '" + expected_referrer + "'.");
           assert_equals(result.headers.referer,
-                        expected_referrer || t._expectedReferrerUrl,
-                        "Reported Referrer URL from HTTP header is '" +
-                        (expected_referrer || t._expectedReferrerUrl) + "'");
-        }, "Reported Referrer URL is as expected: " + t._scenario.referrer_url);
+                        expected_referrer,
+                        "Reported Referrer URL from HTTP header is '" + expected_referrer + "'");
+        }, "Reported Referrer URL is as expected: " + (expected_referrer || t._expectedReferrerUrl));
 
         test.done();
       })
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/a-tag.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/a-tag.html
index 00623cbe819..8f8b8da6497 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/a-tag.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/a-tag.html
@@ -3,34 +3,57 @@
   <head>
   </head>
   <body>
-    <a id="button">go</a>
     <script>
       var url = new URL(window.location.toString());
       var id = url.searchParams.get("id");
-      var redirection = url.searchParams.get("redirection");
-      var cache_destroyer = url.searchParams.get("cache_destroyer");
-      var tag_attrs = url.searchParams.get("tagAttrs");
 
-      console.log(id);
-      console.log(redirection);
-      console.log(cache_destroyer);
-      console.log(tag_attrs);
+      var xhr = new XMLHttpRequest();
+      xhr.open('GET', 'stash.py?path=a-tag-stash&id=' + id, false);
+      xhr.send();
+      params = JSON.parse(xhr.responseText);
+
+      var xhr = new XMLHttpRequest();
+      xhr.open('POST', 'stash.py?path=a-tag-document-url&id=' + id, false);
+      xhr.send(JSON.stringify(window.location.toString()));
+
+      var redirection = params["redirection"];
+      var cache_destroyer = params["cache_destroyer"];
+      var tag_attrs = params["tagAttrs"];
+      var meta_referrer = params["metaReferrer"];
+      var protocol = params["protocol"];
+      var host = params["host"];
 
       var referrer_policy;
       try {
-        referrer_policy = JSON.parse(tag_attrs);  
+        referrer_policy = JSON.parse(tag_attrs);
       } catch(e) {
         referrer_policy = {};
       }
 
-      var a = document.getElementById("button");
-      a.href = "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py?id=" + id + "&redirection=" + redirection +
-               "&cache_destroyer=" + cache_destroyer;
+      if (meta_referrer !== "undefined") {
+        var meta = document.createElement("meta");
+        meta.name = "referrer";
+        meta.content = meta_referrer;
 
-      for (var attr in referrer_policy) {
-        a[attr] = referrer_policy[attr];
+        document.head.appendChild(meta);
       }
 
+      var a = document.createElement("a");
+      a.href = protocol + "//" + host +
+        "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py" +
+        "?id=" + id +
+        "&redirection=" + redirection +
+        "&cache_destroyer=" + cache_destroyer;
+
+      // referrer_policy could be:
+      // {rel: "noreferrer"}, or
+      // {referrerPolicy: "POLICY_YOU_CHOOSE"}
+      for (var attr in referrer_policy) {
+          a[attr] = referrer_policy[attr];
+      }
+
+      document.body.appendChild(a);
+
       a.click();
     </script>
   </body>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/a-tag.py b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/a-tag.py
new file mode 100644
index 00000000000..24330e4f3c2
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/a-tag.py
@@ -0,0 +1,22 @@
+import os, json, sys
+this_dir = os.path.dirname(os.path.abspath(__file__))
+sys.path.insert(0, this_dir)
+
+import mozresource; subresource = mozresource
+
+def generate_payload(server_data):
+    with open(os.path.join(this_dir, "a-tag.html")) as f:
+        return f.read()
+
+def main(request, response):
+    path = 'a-tag-stash'
+    server_data = json.dumps(request.GET)
+    stashed_data = request.server.stash.take(request.GET["id"], path)
+    if stashed_data:
+        server_data = stashed_data
+    request.server.stash.put(request.GET["id"], server_data, path)
+    http_header_referrer_policy = request.GET["httpReferrer"] if "httpReferrer" in request.GET else None
+    subresource.respond(request,
+                        response,
+                        payload_generator = generate_payload,
+                        http_header_referrer_policy = http_header_referrer_policy)
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/mozresource.py b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/mozresource.py
index ca688deebea..763062ce52c 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/mozresource.py
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/mozresource.py
@@ -24,12 +24,12 @@ def create_redirect_url(request, cross_origin = False):
     if cross_origin:
         destination_netloc = get_swapped_origin_netloc(parsed.netloc)
 
-    query = filter(lambda x: x.startswith('id='), parsed.query.split('&'))
+    query = filter(lambda x: not x.startswith('redirection='), parsed.query.split('&'))
     destination_url = urlparse.urlunsplit(urlparse.SplitResult(
         scheme = parsed.scheme,
         netloc = destination_netloc,
         path = parsed.path,
-        query = query[0] if query else None,
+        query = '&'.join(query),
         fragment = None))
 
     return destination_url
@@ -73,7 +73,8 @@ def respond(request,
             content_type = "text/html",
             payload_generator = __noop,
             cache_control = "no-cache; must-revalidate",
-            access_control_allow_origin = "*"):
+            access_control_allow_origin = "*",
+            http_header_referrer_policy = None):
     if preprocess_redirection(request, response):
         return
 
@@ -83,6 +84,9 @@ def respond(request,
     if access_control_allow_origin != None:
         response.writer.write_header("access-control-allow-origin",
                                      access_control_allow_origin)
+    if http_header_referrer_policy != None:
+        response.writer.write_header("referrer-policy",
+                                     http_header_referrer_policy)
     response.writer.write_header("content-type", content_type)
     response.writer.write_header("cache-control", cache_control)
     response.writer.end_headers()
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/generate.py b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/generate.py
index a7972aec95a..627133bf6bc 100755
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/generate.py
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/generate.py
@@ -95,7 +95,8 @@ def generate_selection(selection, spec, subresource_path,
                 'content="referrer %(referrer_policy)s">' % spec
         elif selection['delivery_method'] == 'http-rp':
             selection['meta_delivery_method'] = \
-                "<!-- No meta: Referrer policy delivered via HTTP headers. -->"
+                '<!-- No meta: Referrer policy delivered via HTTP headers. -->' \
+                '<meta name="http-referrer-policy" content="%(referrer_policy)s">' % spec
             test_headers_filename = test_filename + ".headers"
             with open(test_headers_filename, "w") as f:
                 f.write('Referrer-Policy: ' + \
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
index d52a2ef9a2a..83bf807c0cd 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
index 813bb809cdb..cee768b4d3f 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
index fd3a87bad1f..09ecf5a98f3 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
index 8542c2ba0da..a9dc72117a5 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
index 10c4cf341e0..1750d9a09bc 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
index 275b299b50e..f2cd6e01066 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
index 33c7a8e5a9f..eaa02ad2983 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
index 244d9ac7441..4ae39d55784 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
index 6a1d7fcadd4..c9864a5a1ee 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
index 74d38a1371f..e81fc8826ef 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
index 55fb6db6af4..e6bdd252161 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
index 95e904b4515..19a2fe06582 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
index fb7856ea5de..cfa06807b36 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
index 31ffbc25534..324884e8c3d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
index 7e60a38ed6b..07780241974 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
index 1ee848a5246..01a946be353 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
index 1803cd8fac6..ff442044fc4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
index c67fbd12a85..890bd45e038 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
index 0bdf72c069f..adb2c9dd25b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
index 9a8aec3b45c..3bd097e1f8a 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
index a588ccec0c3..3b50585996e 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
index d88cdc40844..ab8d6bbe7dd 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
index cfbbe8ad4c5..2c2ab524a34 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
index 6f058e2b604..f37ebb1e83e 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
index eb7e5312bd6..850f68df4bc 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
index 8164755045e..9605a483c60 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
index 0b01c24a155..ce77bfdac5d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
index ff49550988f..d2cbca0c187 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
index a3b7628ae70..5ea85574719 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
index 9fbd4ca80a5..6feb8e25d7c 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
index 185cb26710d..32672ff5810 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
index 7935bfba13e..68eafc86595 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
index cda8f65c7fb..8f45b4cc4e5 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
index 834a3e3eabc..ac808dd6df3 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
index 9d5e2aadbbb..ebdd25b0abb 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
index e0e4916a8f2..a8ba4b2f236 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
index 1a800d8adbd..36a5dcdfa4d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
index 612daf14f16..f8558f488a6 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
index 4c6a909c378..ffbda4f21db 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
index b2d75b53ee7..e2ec6987400 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
index 6a84ab0f338..85920063000 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
index 6204b3bde1b..d7110749891 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
index 56d574185db..e87c84ec0da 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
index fb5eb0a6eb1..7c5ef9383a6 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
index 6d1db1bff3d..fd55d3a6a07 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
index 96559a62235..550eee944f2 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
index 7f95df1f192..a89179ba454 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
index be5179b18c5..1ed25cc30c8 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
     <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
index 5e4b1ce72a1..a2b065d6b26 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
index 59a616c723a..72af59fd829 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
index 1515845409d..d593b58fe40 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
index a60ee640864..c837d1c0f10 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
index faecf6ca96f..c999da57203 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
index d146fe1e5ae..246f9e80b23 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
index 94cf56b5f4d..e44c3596a0d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
index 751a4e00db6..9f8dc97322a 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
index e04d678d942..06bd9ef1c9d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
index d49ffc5a48f..8d8f78563ab 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
index b245be4a054..7b15091b001 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
index a1bc8cc42e5..e93c7ad539b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
index 2f262cd0a46..279994960af 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
index 42bc6c41a77..9c389b696a6 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
index b0749ec96fb..c15cb2e7ccd 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
index 824e7c67194..8fc3c1025d7 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
index eb9e6cfd8b9..27aa02f7092 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
index ddaafbb851b..42c11cd548d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
index 9bd3f5a0526..94172e0932d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
index a6c882d8cbb..0caa9038f71 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
index 144869329c5..1a5d0d016a4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
index 88d449d3443..df2c221cf75 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
index a4f6b9b10d1..fbde8afaf27 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
index f814836a08c..5a7cadef302 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index 3101dfdcf15..77e5e8d48a3 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
index 92ddaf2031c..3ad89e9922b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index 2b55ae30914..83da898bf3c 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index 7b2dd0c0b8b..8bf9811b9a4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
index cb1422d6c49..be0a0f5cc56 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index e14142d8af6..8fe5a517d5f 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index eca7753ea11..32759c04828 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
index 1d6d0991d65..f1f700ca9b9 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index e1c575b69a9..fbd53059054 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index 7744bfe4009..b6150dde844 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
index b1157f92f44..a2a1db135fc 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index 7bd7885d095..13176108c8e 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index 5831374f629..9707534637e 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
index 45c0ae5cf2a..0b94a5651b2 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index 28e1274f4a2..fd3e18548a3 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
index a0697b88240..51940c818f4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
index 760b4d00b7d..d79f35c4db1 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
index 37fa3ef9540..6d8aac0b098 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
index 3798343b8c2..732b81fa39d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
index eee71dc88d5..68f660949ff 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
index 7706689caf8..33cc2cd2074 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index b2b31a6a8fc..3d173eaaefc 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
index f92cfddfb84..2561ba4d319 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index 54a4cc69d5b..cc793db90bd 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
index 4013579df2d..69c952cd784 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
index 062382b1cff..d757d0593fd 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
index 3be8ed01ce4..4d7b5a3d3f6 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
index 4a71a32de70..09981bbb6aa 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
index 7e77aa502ad..711d89c27a5 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
index 36645ddb253..920a6aa6db1 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index 7578fe5e3b3..30e24be56b9 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html
index c5d74c00cd8..117497f3ff9 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index 297dea99bee..0e6d4a9e118 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
index ae47e7d6218..e95d47d00f9 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
index a71dc0bc3db..ddd4a15dd18 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
index 3810a3a3831..210024dcd96 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
index 649ff96631d..c184cd6a656 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html
index ac7b4ea607b..4fac6209fe6 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
index 1e2a5faa1e6..b777f5d7346 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index 7a014a59d78..1bf59a19f22 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html
index 83390ebd565..dd20ac03da1 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index 4de607fb745..04606d455f7 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
index 034bfdcf4e6..5f4a0b837f8 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
index 31b469d886f..7f867505892 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
index 96837c39ee5..9583a7b4d3d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
index 3c4e1dba39f..677ba17cba9 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html
index 4472fcb380f..0df663772b3 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
index 305ffb565e1..49f9b375b62 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
     <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index dd5a7eb6c80..45da314204e 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
index 7599697c4c9..b259b7d8064 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index cb6e157823f..4deb67194d7 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index 585d7a23f0a..6d00e4eeb09 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
index 44ffdaa71da..791247457d9 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index 5d224161406..f2ed755b6d6 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index a726c3e6b28..6b2540d5f5f 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html
index 0718f3da0ac..819b5922ad4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index 0154b564cf6..1429500d3c9 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index d01954ba072..2f0a2304609 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html
index f23078c88b5..28a4e866df0 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index 96909abae79..be955ec5ae7 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index 7c7945802dc..82ade79f959 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
index 536a465acbd..d30a2c60448 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index a4918aa6a1c..d8c1c5c12c4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index bc76c990231..13ffc1e1a26 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
index 765eec3765c..90af09cd5aa 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index e8145c0d18f..1b38c274630 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index ee60cdefd38..fff8111ef0e 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
index 2a2a195159a..b3ed7b08674 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index bbc7094389a..72c9500f066 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index d8f65985a7a..42a9b7b023c 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
index 7dfa2887869..078ee850132 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index 36fc142f6a0..88ce04e35ab 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index 97da2c9e39e..3bfe8fd9c86 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
index 6da10f5e6d8..de5baf213d2 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index eb2bed5cebc..84829846daa 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index 0a5ebb1c86e..0cff6bfc9fa 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
index 5fac945c25f..826bb87307f 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index 916a7d8473f..9684bbc28c5 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index e0d715d84ce..d270cb39f8b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
index f8e0a3c78da..dc28d81061c 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index ce5824771ac..0c32784d7a5 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index 34c878e93da..f80fe8f7dae 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
index a5e93a923ed..f556af21e8d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index c3a85c20b70..d7f59c41bf2 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
index 87cb2c176c9..815c38b5dd2 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
index 02192a36c5d..ded83d5d7da 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
index e4c6ad6fe92..cbcccaba567 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
index b2deeeca93d..67d3c1a1624 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
index 075ed8457a0..a452885cc24 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
index dcd4a50a590..0b6928140cf 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
index fd74a8dc8ad..e130f72c2bf 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
index 250e114e7af..4ac830a03c4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
index e9fdfbe009b..04fd8577b72 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
index b430b4a1edb..c29f95f22df 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
index 0fb10a2a57f..13b3de74e09 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
index bd0cf09398a..18c5714e3a4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
index bd0cf09398a..18c5714e3a4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
index b430b4a1edb..c29f95f22df 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
index 0fb10a2a57f..13b3de74e09 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
index bd0cf09398a..18c5714e3a4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
index 3ac0b748d19..343ce2731d3 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
index ec927dd5564..004fb320048 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
index 5e2ab741e44..ef2f5ff0d36 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
index fab62a24441..c9e4e2bdb48 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
index 0f4e572b822..530b5af744e 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
index d15cbd4355d..fb20d79f52b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
index 43f64eda068..326b9994a50 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
index 3f5b360eaf9..cbd4159afc3 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
index 534c374a492..3bedb2ee41e 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
index d2b48fdb828..3fac660ebf0 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
index 9a6d30233fe..d8d9e5a1aed 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
index 88cea45ab22..6478ba73fb9 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
index 31599644fa1..46daea793ea 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
index 365f9253d26..07acdbe7689 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
index 18130be7229..2526f2cfacd 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
index 6c5e401cf39..feb4bee59d2 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
index 10959015bab..4035b957050 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
index ff098c410f4..a15529459cd 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
index a2a2fb7c405..9900ed1274e 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
index 79ea7b5a670..d874a5bea34 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
index 88ee37c0ce0..8346d8ebee7 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
index 9f371c3c46a..c532e2d40fb 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
index 90c1be44ac8..f63abd6a25d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
index 6cefe1fe3d6..b58096acd88 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
index 9db2106d17a..e6ad72f5dec 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
index 2d284b737f2..784d927fbae 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
index ccd3d2b19ba..2d078641a2b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
index e2595e77550..9699d68e608 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
index b644b8f6a9a..643d25eb258 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
index 0e9b09a4e51..a5a665855bf 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
index 0e9b09a4e51..a5a665855bf 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
index e2595e77550..9699d68e608 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
index b644b8f6a9a..643d25eb258 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
index 0e9b09a4e51..a5a665855bf 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
index dfa5117e4a3..5a0d1c44cfe 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
index 354c50d1345..9174597bb1b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
index 64ae51350cf..03ed4974e1d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
index 64ae51350cf..03ed4974e1d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
index dfa5117e4a3..5a0d1c44cfe 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
index 354c50d1345..9174597bb1b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
index 64ae51350cf..03ed4974e1d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html
index 35bce1b365a..74d050c01e2 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html
index c51d358796c..c683f39386a 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html
index 0b885fa8393..9a83e45fc9b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
index 0b885fa8393..9a83e45fc9b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html
index 35bce1b365a..74d050c01e2 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html
index c51d358796c..c683f39386a 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html
index 0b885fa8393..9a83e45fc9b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
index d18ec94bf6a..8c1dd13f7d3 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
index cefb4f39352..e0bdbf2e738 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
index 6495a62b6a0..9ec4e2eee25 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
index 289bf3beb7d..ca798ce4de9 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
index 82cea73a91b..cc4e0dfcc61 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
index bce9fe36f3c..d46ea96f809 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
index 32ce2a0fdc3..fd290122d4a 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
index 371e6466ee1..b1d294625df 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
index 9ac773032e3..0abec66abc5 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
index 1edea9b6df6..dad14a2029f 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
index 61ffec7b6c7..21ba0112760 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
index 02d0528f2dc..4551f14155d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
index 02d0528f2dc..4551f14155d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
index 1edea9b6df6..dad14a2029f 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
index 61ffec7b6c7..21ba0112760 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
index 02d0528f2dc..4551f14155d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
index 31416960baf..7a0f11781f6 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
index 5d8bb643c18..ea68bc8d360 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
index 60389d4cbcf..4fb42c82c17 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
index 1748db88ee1..73e4981835c 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
index b998076428d..70827af78c9 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
index 52ead55e497..00460d2b158 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
index 94b69701a24..f77f66508af 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
index 829299f11ca..eb5163656c1 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
index a16507155f6..079b162006c 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
index 6a3f5464b66..0016765809e 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
index e89744ed8af..eebede0c192 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
index fef5eb9a885..1a49a2edfa8 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
index fef5eb9a885..1a49a2edfa8 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
index 6a3f5464b66..0016765809e 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
index e89744ed8af..eebede0c192 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
index fef5eb9a885..1a49a2edfa8 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index 1d417063137..f71a89d5a06 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
index d34a7b60a0c..ab50e53d7da 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index d43a0a38d48..6285bb9dd0e 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index 0124915e636..15ba583677c 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
index 1f8a73e2b1a..4278df3afcc 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index c9878c4020c..866bf28e395 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index 00b62c33000..47bf32f7796 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
index ebba0bf7ca8..ba7f97463b8 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index 8edefea1278..89407a8fc40 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index 51e731bddcb..e53ed40a362 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
index d2c85b423f5..cec1e3241e7 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index 5e0c0c5bd37..2b501bc0e25 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index 8a1a8a2ba53..b3f3fa89f00 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
index 835781b51ac..ede8337afdc 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index 57ac3f67b58..fee053bbaa0 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
index 38577f3bb31..d51a67fecb1 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
index ac99518ceec..93bb6427144 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
index e5710250fcf..b96ed59303b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
index 349b701f426..7978befcbb4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
index edbaeff9917..83107c22a97 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
index 5da63d7a7b6..15415806924 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index f091fe92952..bfa539628c2 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
index 16840b8271a..0bf5e85e7f1 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index a6648a7d25b..d21adb12187 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
index a788092639c..ba07e73e1ae 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
index 6d60f222210..b1d4a3a6c2a 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
index 3e234fc0c43..17a3af34f5d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
index b14b274fb9a..8440f01adeb 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
index ac3ccea7e30..d8eed570f42 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
index 2f118d3d466..313554bb642 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index 381e27e82ff..5215d602a82 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html
index f4ec51c7a5c..7ec48982bf7 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index f12b2ee93e6..caefa979a8f 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
index 0d69de3c184..1d97caffff5 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
index e724204379e..5e52c0071af 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
index ee777cbdd3a..aebc77f4060 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
index 991e9193dcf..431959cedaf 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html
index aca4eb20a41..c9d7de85f5b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
index ff01205e322..8a8c495f79a 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index a13cddd1f5b..88f33debae8 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html
index 1716679ed50..587dec2eed4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index 9867bb49e9b..6e4975ddd1c 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
index a4c49f936c8..d9521c9f3bd 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
index 7686ac73690..96507206472 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
index defdc4ccad1..08aa2fc9e04 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
index baefa909d27..19771b222b9 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html
index a20e8349e84..82db2bf5149 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
index f95e7b4f3dc..ad2ac0a5cc1 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
     <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
     <meta name="assert" content="The referrer URL is origin when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index b5c7f8821e0..0331c47034a 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
index 007baddd15e..acf164cb0c8 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index cd7d3389d58..e32860d57a9 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index 555c697dd97..d601be6ac9e 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
index e798e450de1..0d4e85774b4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index da2a21f512b..af0ebfff865 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index e2ee5ce17c9..20031b40fc8 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html
index 80c03a89077..fd87b73e53d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index fd6d9b44990..37477fa39d4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index 65b59716ab5..5a225b0e497 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html
index ee984a25018..3c3451162c0 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index dd3f8f14261..9667c5ac9f0 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index b1d40111c79..20d18f01222 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
index c9c2184bbfc..49ad6dcb103 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index b7c94dd8045..1329e58f725 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index fb33e3691ac..ca78ee55828 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
index 38abb099cdb..eda8846df09 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index 74918ece23b..02ad3f38129 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index d3fdca896b1..0076ed61b34 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
index fd41185aa75..ac19d40181d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index 1e5687b9e31..b3527924da8 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index 2ac04ac5cb0..569b935c6e6 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
index 3721d1e8060..d519377294d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index f3996f0e1e0..1ff73198087 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "origin"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
index 8c4c59ae9fc..64c3e513117 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
index e2b434d4bb4..07b3f14fc1c 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
index f277161fe04..f5330d6d5d5 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
index 2c81426df78..630f675cf67 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
index 72722731a85..3aff8cafb67 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
index a9dd93e9785..9bae615f2e8 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
index 5f99104ee50..f15ae6275cf 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
index 8cdf4251577..6dc602b5fa7 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
index ec59b5e3cf8..3713c113ed3 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
index e4d89a200ad..f55b88eb3bc 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
index d22672f4467..a1a7ea824b9 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
index c3d92922915..19ba88b3897 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
index 8b68fb5aa11..9144d3bdd9b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
index 4af63c3aa14..1656f802bdc 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
index fe98dba1798..3f9e73b0f47 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
index 534800dd777..19902610e43 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
index 1fcae51ea47..3ae0fc113f7 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
index f8ea1f217b5..c6a25b099cd 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
index f73f6955bc2..012454dff81 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
index 63a734a3822..802b76c990d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
index bb9e9cbc3c5..8b68bc2e7a0 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
index cde93973267..6808e0eeb25 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
index e7b1e5c24df..334f788ff02 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
index 545c8b13052..f3935a8d01a 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
index fb27fefc5ce..9a19f366a4c 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
index e857b90c629..54a58f0657b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
index 9ed1cd7318c..973d442b22d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
index 5d75b4f1e1e..db9e8f45bc3 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
index 764e1162ce9..24c16d859ff 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
index e7d65bf00e5..54991a5baf2 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
index 559dcf03058..8f1e8a63794 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
index 1bf1c1c9ee6..eae3e204605 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
index d4e59189acb..990ef336278 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
index 2b41c2ef884..9fb89ff1955 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
index f81cecc348f..1a63a6bd5b0 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
index 551342cc7de..945ba27e398 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
index 094b9f7d430..3bb1fdabae3 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
index 1a416a89c46..47cf5944b62 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
index af5da1323b4..794b5716945 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
index 47cdacdec2e..d6858676dd2 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
     <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
     <meta name="assert" content="The referrer URL is omitted when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
index 996ad12ac52..a83240bcb3a 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
index 8f717e16129..81806a28228 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
index 09bebb34d9e..fb08052790f 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
index 8737f9ee571..861b4ba1963 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
index 677489d5dbf..4427f355087 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
index 827f9b34ed3..fe2d26bc276 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
index 4863add9e4f..8458782abc4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
index fb764492a58..0d38bcfe37f 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
index e74e71e3cb8..5212d8281b0 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
index a65f942b59f..b781baac14f 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
index 251ae4e3e1b..16c78406d19 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
index 30ea77ee675..8b732b83676 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
index 28b549a3f07..44d49058666 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
index f32a63c6ea2..46a128d1ccd 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
index 55849597e5a..e997bbb313b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
index 71511067466..9ec94e174b8 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
index 54b7f77d367..78bb08e9bf7 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
index 15af9548966..acc7b48132e 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
index dce80e0ba5c..52d73b3986d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
index 0b72dae74a9..3ce89779567 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "omitted"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/spec.src.json b/tests/wpt/mozilla/tests/mozilla/referrer-policy/spec.src.json
index bf5bfc8fd1e..f7adf5560cc 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/spec.src.json
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/spec.src.json
@@ -394,7 +394,7 @@
 
   "subresource_path": {
     "iframe-tag": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-    "a-tag": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+    "a-tag": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
     "link-tag": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py"
   }
 }
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/spec_json.js b/tests/wpt/mozilla/tests/mozilla/referrer-policy/spec_json.js
index 34067f2cfc5..7876ce88d71 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/spec_json.js
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/spec_json.js
@@ -1 +1 @@
-var SPEC_JSON = {"subresource_path": {"a-tag": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html", "iframe-tag": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py", "link-tag": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py"}, "test_expansion_schema": {"origin": ["same-origin", "cross-origin"], "subresource": ["iframe-tag", "a-tag", "link-tag"], "target_protocol": ["http", "https"], "expansion": ["default", "override"], "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer", "rel-noreferrer"], "redirection": ["no-redirect", "keep-origin-redirect", "swap-origin-redirect"], "referrer_url": ["omitted", "origin", "stripped-referrer"], "source_protocol": ["http", "https"]}, "specification": [{"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policies", "referrer_policy": null, "title": "Referrer Policy is not explicitly defined", "test_expansion": [{"origin": "*", "name": "insecure-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "upgrade-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "downgrade-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "secure-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}], "name": "unset-referrer-policy", "description": "Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer", "referrer_policy": "no-referrer", "title": "Referrer Policy is set to 'no-referrer'", "test_expansion": [{"origin": "*", "name": "generic", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer", "rel-noreferrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "*", "subresource": "*"}], "name": "no-referrer", "description": "Check that sub-resource never gets the referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade", "referrer_policy": "no-referrer-when-downgrade", "title": "Referrer Policy is set to 'no-referrer-when-downgrade'", "test_expansion": [{"origin": "*", "name": "insecure-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "upgrade-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "downgrade-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "secure-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}], "name": "no-referrer-when-downgrade", "description": "Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin", "referrer_policy": "origin", "title": "Referrer Policy is set to 'origin'", "test_expansion": [{"origin": "*", "name": "generic", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "*", "subresource": "*"}], "name": "origin", "description": "Check that all subresources in all casses get only the origin portion of the referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin", "referrer_policy": "same-origin", "title": "Referrer Policy is set to 'same-origin'", "test_expansion": [{"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-secure-default", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "*", "expansion": "override", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "swap-origin-redirect", "referrer_url": "omitted", "source_protocol": "*", "subresource": "*"}, {"origin": "cross-origin", "name": "cross-origin", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "*", "subresource": "*"}], "name": "same-origin", "description": "Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin", "referrer_policy": "origin-when-cross-origin", "title": "Referrer Policy is set to 'origin-when-cross-origin'", "test_expansion": [{"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-secure-default", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-upgrade", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-downgrade", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "*", "expansion": "override", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "swap-origin-redirect", "referrer_url": "origin", "source_protocol": "*", "subresource": "*"}, {"origin": "cross-origin", "name": "cross-origin", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "*", "subresource": "*"}], "name": "origin-when-cross-origin", "description": "Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url", "referrer_policy": "unsafe-url", "title": "Referrer Policy is set to 'unsafe-url'", "test_expansion": [{"origin": "*", "name": "generic", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "*", "subresource": "*"}], "name": "unsafe-url", "description": "Check that all sub-resources get the stripped referrer URL."}], "referrer_policy_schema": [null, "no-referrer", "no-referrer-when-downgrade", "same-origin", "origin", "origin-when-cross-origin", "unsafe-url"], "excluded_tests": [{"origin": "*", "name": "mixed-content-insecure-subresources", "target_protocol": "http", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "elements-not-supporting-rel-noreferrer", "target_protocol": "*", "expansion": "*", "delivery_method": ["rel-noreferrer"], "redirection": "*", "referrer_url": "*", "source_protocol": "*", "subresource": ["iframe-tag"]}, {"origin": "*", "name": "source-https-unsupported-by-web-platform-tests-runners", "target_protocol": "*", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "https", "subresource": "*"}]};
+var SPEC_JSON = {"subresource_path": {"a-tag": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py", "iframe-tag": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py", "link-tag": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py"}, "test_expansion_schema": {"origin": ["same-origin", "cross-origin"], "subresource": ["iframe-tag", "a-tag", "link-tag"], "target_protocol": ["http", "https"], "expansion": ["default", "override"], "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer", "rel-noreferrer"], "redirection": ["no-redirect", "keep-origin-redirect", "swap-origin-redirect"], "referrer_url": ["omitted", "origin", "stripped-referrer"], "source_protocol": ["http", "https"]}, "specification": [{"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policies", "referrer_policy": null, "title": "Referrer Policy is not explicitly defined", "test_expansion": [{"origin": "*", "name": "insecure-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "upgrade-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "downgrade-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "secure-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}], "name": "unset-referrer-policy", "description": "Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer", "referrer_policy": "no-referrer", "title": "Referrer Policy is set to 'no-referrer'", "test_expansion": [{"origin": "*", "name": "generic", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer", "rel-noreferrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "*", "subresource": "*"}], "name": "no-referrer", "description": "Check that sub-resource never gets the referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade", "referrer_policy": "no-referrer-when-downgrade", "title": "Referrer Policy is set to 'no-referrer-when-downgrade'", "test_expansion": [{"origin": "*", "name": "insecure-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "upgrade-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "downgrade-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "secure-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}], "name": "no-referrer-when-downgrade", "description": "Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin", "referrer_policy": "origin", "title": "Referrer Policy is set to 'origin'", "test_expansion": [{"origin": "*", "name": "generic", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "*", "subresource": "*"}], "name": "origin", "description": "Check that all subresources in all casses get only the origin portion of the referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin", "referrer_policy": "same-origin", "title": "Referrer Policy is set to 'same-origin'", "test_expansion": [{"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-secure-default", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "*", "expansion": "override", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "swap-origin-redirect", "referrer_url": "omitted", "source_protocol": "*", "subresource": "*"}, {"origin": "cross-origin", "name": "cross-origin", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "*", "subresource": "*"}], "name": "same-origin", "description": "Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin", "referrer_policy": "origin-when-cross-origin", "title": "Referrer Policy is set to 'origin-when-cross-origin'", "test_expansion": [{"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-secure-default", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-upgrade", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-downgrade", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "*", "expansion": "override", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "swap-origin-redirect", "referrer_url": "origin", "source_protocol": "*", "subresource": "*"}, {"origin": "cross-origin", "name": "cross-origin", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "*", "subresource": "*"}], "name": "origin-when-cross-origin", "description": "Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url", "referrer_policy": "unsafe-url", "title": "Referrer Policy is set to 'unsafe-url'", "test_expansion": [{"origin": "*", "name": "generic", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "*", "subresource": "*"}], "name": "unsafe-url", "description": "Check that all sub-resources get the stripped referrer URL."}], "referrer_policy_schema": [null, "no-referrer", "no-referrer-when-downgrade", "same-origin", "origin", "origin-when-cross-origin", "unsafe-url"], "excluded_tests": [{"origin": "*", "name": "mixed-content-insecure-subresources", "target_protocol": "http", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "elements-not-supporting-rel-noreferrer", "target_protocol": "*", "expansion": "*", "delivery_method": ["rel-noreferrer"], "redirection": "*", "referrer_url": "*", "source_protocol": "*", "subresource": ["iframe-tag"]}, {"origin": "*", "name": "source-https-unsupported-by-web-platform-tests-runners", "target_protocol": "*", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "https", "subresource": "*"}]};
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index 2f6f0040608..045bcac93b1 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
index 4e479cb4502..b072b5a4c02 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index 211e769b83c..f2ad2ddedfd 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index 50c4f6beea8..a05dee44af0 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
index 796ef02281b..9cce7e804ba 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index f654a5786ac..b30b4c6d30f 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index aeb0ebf9c61..b7ac0533265 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
index 89b11f5b638..a90bbbda2dc 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index fb06b21b0ca..bd0892ddb93 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index a22c969da83..581ce7e2114 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
index e35b1ce0bcb..eeb41bebe4b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index 181d71ff118..5835df3255a 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index b4c2fb8c997..a3e03d25100 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
index f583a5c7b96..7cb2cf9f282 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index 4bd1430ec61..877481e5278 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
index 7d271906857..812aaf97b3b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
index b7a56bd7797..7079a3ecf12 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
index 7e1a680fc4d..4d0abae23bc 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
index d15da9c0f62..263ed4ad8a3 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
index aba091b50ae..0d711ba831e 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
index 785c514ea3a..a776b110beb 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index 2aec4c7dbbf..4d3ec5a2d28 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
index 93249ada63f..a4f6c9d4ad9 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index 1f2632d4d69..3fbe4baf4aa 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
index 21b3f3195c9..8ca7b4f8019 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
index 3b00411efcf..03536b7d829 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
index 6c3e1f4b4e4..312c3306555 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
index 8ead70c17eb..38ad3e7c716 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
index 985d32df62f..26a0b4ca86b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
index 89859ca9343..b2cd36278b0 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index 3f6ff3e0b1c..e07172d0859 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html
index 59eb8b9cf65..e698f8d2370 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index e4f9aeb54af..d63b7a8d734 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
index aa2e8fddd79..3296688b653 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
index 1eae10c63c4..0798bd32eb4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
index 1a52abdb5f3..be0c6556d80 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
index f0573153549..04b712594d2 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html
index 9e133f444ed..f77e949d088 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
index 45cb38687d9..227f9f617a9 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index 68d0d60ca14..7ce1dbb2723 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html
index 5f5605fa404..b221db2ce0f 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index 3a109daec6c..8732ad05733 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
index e5615d5b37b..dd2862159a8 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
index 8bbf6734d3e..2b65afe48cb 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
index dcc80981959..10af95e08be 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
index e318e4218e3..9d1efa4b78c 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html
index 1ff64a56947..20262f9f3b6 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
index 9eb97c25f21..1746e7e2677 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
@@ -4,7 +4,7 @@
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
     <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index d6e548dd533..5716de7f0e8 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
index bcce5de7e6d..474328d554e 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index c7c9586107b..9119c33215f 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index 6caa1fe4dff..54168c30911 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
index 4ffc4796a98..5d5d9cd8b7d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index 69e8e1354e2..c0c70e205b0 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index 3fb774b8393..9319c0711cc 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html
index 25e815d963e..3ee2577c1a7 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index 47c61f99740..4ebbe2ddd68 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index eb08b45e944..305e52dd1d4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html
index 2b04848701a..0fb463d9cb9 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index a9dc19846a8..3822d95abf4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index 3858a6fd70d..de16edf2389 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
index 5cce000a48d..e01d1c5974f 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index 3c045bf7f1c..a72d8e10263 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index bcee8e7cf75..4f9d7a427e5 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
index 9fccde4be70..9eb02e21b6a 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index 3ea0303a7e0..0788cb7ef60 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
index 3b3e1db6a84..9441fb3e141 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
index 570ac78292d..7ab0e0b903f 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
index d29513f6472..5b583c37407 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
index c8f76ae7a70..2d8ba97e933 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
index 76e979a8753..d2efd78994c 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
index cbfff7e5c3d..0d4515e1073 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
@@ -29,7 +29,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
index 6cb181f41f3..93b9d5aecf5 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
index da3dff3a449..a91cf4ae8c4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
index 1ee7f8537c2..8a082d8ef39 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
index 5f40f4467d5..d6c5583476b 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
index b95f0eb2147..3dd098ae5de 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
index 1f3e8da533f..185a330236e 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
index 7adb95e24a0..afe427f1c7e 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
index 8330466cf71..b8fd5b6b9eb 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
index a1fee2cdfd1..f83fc086196 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
index 321dc2de88d..9c0e166e768 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
index 7af91c22825..84231dca9fe 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
index 1b9b70b16b2..b82a55099d0 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
index 30349b7e98a..626d8f9d3c0 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
index 11d776455d8..3886b0f939c 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
index e741c0ac233..71c98dcf126 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
index ff8e51d434a..1c0105ef322 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
index dadd191d167..011e36d58a7 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
index cdafb66c4b7..5dad3ba6608 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
index 67e8aa8b503..26014f6eb13 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
index 0e656542ee5..60ea1c31c61 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
index 51e6fc595fd..d99a44ab922 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
index 56932cb2ead..eebae700192 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
index f0b310a3489..86b4cfc8703 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
index f62db37d8fa..999ce8c8eae 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
index 901a3e7089d..1a31f648665 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
index 0e99827eff3..7a383030848 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
index a0dd447268e..dc59e659dc0 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
index 35005dadbba..cba8b0c1383 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
index f36b10059e6..d22406c8c67 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
index a9d83821a0a..8a51e5df6bd 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
index 7a44bdb5dcd..2950ac7c8e8 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
index 92628338bcc..6a3b56e2dd1 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
index 493402048b9..9e7cae1f028 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
index fba7fd5114a..8fefca756d4 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
index ec269056b82..85deff7538a 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
index 6b8c7a94027..6b7341603eb 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
index 812a00ec374..7c088191c07 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
index ddbd6a755ab..d3bf4236f99 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
index f92f7ada5a1..03aca9aa172 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
index c9502f36ff8..52579447a99 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
index 12303884aaf..e38ef39c25c 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
index 51f8854d568..6e94b34aa03 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
index 46bd50bcb42..748621eaf2c 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
index d16dc784a12..5a329637a5d 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
index cd56a59e867..71694c1737f 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
index 1bafec0d23e..f04c297234f 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
index e36ce40b762..3dee6be3ec6 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
index 682bf2867ab..7b39649e102 100644
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -28,7 +28,7 @@
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.html",
+          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
           "referrer_url": "stripped-referrer"
         },
         document.querySelector("meta[name=assert]").content,