From b6a5f119aed6f330308febf07d6b67dd388d1025 Mon Sep 17 00:00:00 2001
From: Hiroshige Hayashizaki <hiroshige@chromium.org>
Date: Mon, 19 Nov 2018 13:10:57 -0800
Subject: [PATCH] Fix test exclusion logic of wpt/referrer-policy test
 generator

Previously, all worker-request, a-tag, area-tag tests were excluded
because "redirection" field was not included in |selection_pattern|,
and thus "worker-requests-with-swap-origin-redirect" and
"overhead-for-redirection" entries in "excluded_tests" in spec.src.json
were applied to all redirection types.

This CL
- Includes "redirection" field in |selection_pattern| and
  instead remove "redirection" field from filenames, and
- Regenerates tests.

Therefore, this CL
- Adds new test files for worker-request, a-tag, area-tag, and
- Renames existing test files.

The only manual changes are
- referrer-policy/generic/tools/common_paths.py
- third_party/WebKit/LayoutTests/SlowTests
- third_party/WebKit/LayoutTests/SmokeTests
and all other modifications are made by
referrer-policy/generic/tools/generate.py.

Bug: 880027
Change-Id: Ie628f92b334d6e2adddc5957cc6cceaa8c69f322
Reviewed-on: https://chromium-review.googlesource.com/c/1330901
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609433}
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your diff.renameLimit variable to at least 1920 and retry the command.
---
 referrer-policy/generic/tools/common_paths.py |  5 ++-
 .../no-redirect/insecure-protocol.http.html   | 40 ++++++++++++++++++
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../no-redirect/upgrade-protocol.http.html    | 40 ++++++++++++++++++
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../no-redirect/insecure-protocol.http.html   | 40 ++++++++++++++++++
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../no-redirect/upgrade-protocol.http.html    | 40 ++++++++++++++++++
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../no-redirect/insecure-protocol.http.html   | 41 +++++++++++++++++++
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../no-redirect/upgrade-protocol.http.html    | 41 +++++++++++++++++++
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../no-redirect/insecure-protocol.http.html   | 41 +++++++++++++++++++
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html               | 41 +++++++++++++++++++
 .../insecure-protocol.http.html.headers}      |  0
 .../no-redirect/insecure-protocol.http.html   | 41 +++++++++++++++++++
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../no-redirect/upgrade-protocol.http.html    | 41 +++++++++++++++++++
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers        |  2 +
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers        |  2 +
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers        |  2 +
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers        |  2 +
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers        |  2 +
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers        |  2 +
 .../no-redirect/insecure-protocol.http.html   | 41 +++++++++++++++++++
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../no-redirect/upgrade-protocol.http.html    | 41 +++++++++++++++++++
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../no-redirect/insecure-protocol.http.html   | 41 +++++++++++++++++++
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html               | 41 +++++++++++++++++++
 .../no-redirect/insecure-protocol.http.html   | 41 +++++++++++++++++++
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../no-redirect/upgrade-protocol.http.html    | 41 +++++++++++++++++++
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../a-tag/no-redirect/generic.http.html       | 40 ++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 40 ++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 40 ++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 40 ++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../keep-origin-redirect/generic.http.html    | 41 +++++++++++++++++++
 .../generic.http.html.headers}                |  0
 .../no-redirect/generic.http.html             | 41 +++++++++++++++++++
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers                 |  2 +
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers     |  2 +
 .../generic.http.html}                        |  0
 .../generic.http.html.headers                 |  2 +
 .../generic.http.html}                        |  0
 .../generic.http.html.headers                 |  2 +
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers     |  2 +
 .../generic.http.html}                        |  0
 .../generic.http.html.headers                 |  2 +
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../keep-origin-redirect/generic.http.html    | 41 +++++++++++++++++++
 .../no-redirect/generic.http.html             | 41 +++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/cross-origin.http.html  | 40 ++++++++++++++++++
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../a-tag/no-redirect/cross-origin.http.html  | 40 ++++++++++++++++++
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../same-origin-insecure.http.html            | 40 ++++++++++++++++++
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-downgrade.http.html           | 40 ++++++++++++++++++
 .../no-redirect/same-origin-upgrade.http.html | 40 ++++++++++++++++++
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-upgrade.http.html}            |  0
 .../a-tag/no-redirect/cross-origin.http.html  | 41 +++++++++++++++++++
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../a-tag/no-redirect/cross-origin.http.html  | 41 +++++++++++++++++++
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../same-origin-insecure.http.html            | 41 +++++++++++++++++++
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html            | 41 +++++++++++++++++++
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html            | 41 +++++++++++++++++++
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-downgrade.http.html           | 41 +++++++++++++++++++
 .../same-origin-downgrade.http.html.headers}  |  0
 .../no-redirect/same-origin-upgrade.http.html | 41 +++++++++++++++++++
 .../same-origin-upgrade.http.html.headers}    |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-downgrade.http.html.headers}  |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-upgrade.http.html.headers}    |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-downgrade.http.html.headers}  |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-upgrade.http.html.headers}    |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-downgrade.http.html.headers}  |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-upgrade.http.html.headers}    |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-downgrade.http.html.headers}  |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-upgrade.http.html.headers}    |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-downgrade.http.html.headers}  |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-upgrade.http.html.headers}    |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-downgrade.http.html.headers}  |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-upgrade.http.html.headers}    |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-downgrade.http.html.headers}  |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-upgrade.http.html.headers}    |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-downgrade.http.html.headers}  |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-upgrade.http.html.headers}    |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-downgrade.http.html.headers}  |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-upgrade.http.html.headers}    |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-downgrade.http.html.headers}  |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-upgrade.http.html.headers}    |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-downgrade.http.html.headers}  |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-upgrade.http.html.headers}    |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-downgrade.http.html.headers}  |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-upgrade.http.html.headers}    |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-downgrade.http.html.headers   |  2 +
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-upgrade.http.html.headers     |  2 +
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-downgrade.http.html.headers   |  2 +
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-upgrade.http.html.headers     |  2 +
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-downgrade.http.html.headers   |  2 +
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers    |  2 +
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-upgrade.http.html.headers     |  2 +
 .../a-tag/no-redirect/cross-origin.http.html  | 41 +++++++++++++++++++
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../a-tag/no-redirect/cross-origin.http.html  | 41 +++++++++++++++++++
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../same-origin-insecure.http.html            | 41 +++++++++++++++++++
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html            | 41 +++++++++++++++++++
 .../same-origin-insecure.http.html            | 41 +++++++++++++++++++
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-downgrade.http.html           | 41 +++++++++++++++++++
 .../no-redirect/same-origin-upgrade.http.html | 41 +++++++++++++++++++
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-upgrade.http.html}            |  0
 .../same-origin-downgrade.http.html}          |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-upgrade.http.html}            |  0
 .../a-tag/no-redirect/generic.http.html       | 40 ++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 40 ++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 40 ++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 40 ++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../keep-origin-redirect/generic.http.html    | 41 +++++++++++++++++++
 .../generic.http.html.headers}                |  0
 .../no-redirect/generic.http.html             | 41 +++++++++++++++++++
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers                 |  2 +
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers     |  2 +
 .../generic.http.html}                        |  0
 .../generic.http.html.headers                 |  2 +
 .../generic.http.html}                        |  0
 .../generic.http.html.headers                 |  2 +
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers     |  2 +
 .../generic.http.html}                        |  0
 .../generic.http.html.headers                 |  2 +
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../keep-origin-redirect/generic.http.html    | 41 +++++++++++++++++++
 .../no-redirect/generic.http.html             | 41 +++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/cross-origin.http.html  | 40 ++++++++++++++++++
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../a-tag/no-redirect/cross-origin.http.html  | 40 ++++++++++++++++++
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../same-origin-insecure.http.html            | 40 ++++++++++++++++++
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../a-tag/no-redirect/cross-origin.http.html  | 41 +++++++++++++++++++
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../a-tag/no-redirect/cross-origin.http.html  | 41 +++++++++++++++++++
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html.headers}           |  0
 .../same-origin-insecure.http.html            | 41 +++++++++++++++++++
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html            | 41 +++++++++++++++++++
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html            | 41 +++++++++++++++++++
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers}   |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers    |  2 +
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers    |  2 +
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers    |  2 +
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers    |  2 +
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html.headers    |  2 +
 .../a-tag/no-redirect/cross-origin.http.html  | 41 +++++++++++++++++++
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../a-tag/no-redirect/cross-origin.http.html  | 41 +++++++++++++++++++
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../cross-origin.http.html}                   |  0
 .../same-origin-insecure.http.html            | 41 +++++++++++++++++++
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html            | 41 +++++++++++++++++++
 .../same-origin-insecure.http.html            | 41 +++++++++++++++++++
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../same-origin-insecure.http.html}           |  0
 .../no-redirect/cross-insecure.http.html      | 40 ++++++++++++++++++
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../no-redirect/upgrade-protocol.http.html    | 40 ++++++++++++++++++
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../a-tag/no-redirect/same-insecure.http.html | 40 ++++++++++++++++++
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../no-redirect/upgrade-protocol.http.html    | 40 ++++++++++++++++++
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../no-redirect/cross-insecure.http.html      | 41 +++++++++++++++++++
 .../cross-insecure.http.html.headers}         |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html.headers}         |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html.headers}         |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html.headers}         |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html.headers}         |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html.headers}         |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html.headers}         |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html.headers}         |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html.headers}         |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html.headers}         |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html.headers}         |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html.headers}         |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html.headers}         |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html.headers}         |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html.headers}         |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html.headers}         |  0
 .../no-redirect/upgrade-protocol.http.html    | 41 +++++++++++++++++++
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../a-tag/no-redirect/same-insecure.http.html | 41 +++++++++++++++++++
 .../same-insecure.http.html.headers}          |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html.headers}          |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html.headers}          |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html.headers}          |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html.headers}          |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html.headers}          |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html.headers}          |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html.headers}          |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html.headers}          |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html.headers}          |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html.headers}          |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html.headers}          |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html.headers}          |  0
 .../same-insecure.http.html                   | 41 +++++++++++++++++++
 .../same-insecure.http.html.headers}          |  0
 .../no-redirect/same-insecure.http.html       | 41 +++++++++++++++++++
 .../same-insecure.http.html.headers}          |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html.headers}          |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html.headers}          |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html.headers}          |  0
 .../no-redirect/upgrade-protocol.http.html    | 41 +++++++++++++++++++
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers        |  2 +
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers        |  2 +
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers        |  2 +
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers        |  2 +
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers        |  2 +
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers        |  2 +
 .../no-redirect/cross-insecure.http.html      | 41 +++++++++++++++++++
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../cross-insecure.http.html}                 |  0
 .../no-redirect/upgrade-protocol.http.html    | 41 +++++++++++++++++++
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../a-tag/no-redirect/same-insecure.http.html | 41 +++++++++++++++++++
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html                   | 41 +++++++++++++++++++
 .../no-redirect/same-insecure.http.html       | 41 +++++++++++++++++++
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../same-insecure.http.html}                  |  0
 .../no-redirect/upgrade-protocol.http.html    | 41 +++++++++++++++++++
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../no-redirect/insecure-protocol.http.html   | 40 ++++++++++++++++++
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../no-redirect/upgrade-protocol.http.html    | 40 ++++++++++++++++++
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../no-redirect/insecure-protocol.http.html   | 40 ++++++++++++++++++
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../no-redirect/upgrade-protocol.http.html    | 40 ++++++++++++++++++
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../no-redirect/insecure-protocol.http.html   | 41 +++++++++++++++++++
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../no-redirect/upgrade-protocol.http.html    | 41 +++++++++++++++++++
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../no-redirect/insecure-protocol.http.html   | 41 +++++++++++++++++++
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html               | 41 +++++++++++++++++++
 .../insecure-protocol.http.html.headers}      |  0
 .../no-redirect/insecure-protocol.http.html   | 41 +++++++++++++++++++
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html.headers}      |  0
 .../no-redirect/upgrade-protocol.http.html    | 41 +++++++++++++++++++
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers}       |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers        |  2 +
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers        |  2 +
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers        |  2 +
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers        |  2 +
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers        |  2 +
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html.headers        |  2 +
 .../no-redirect/insecure-protocol.http.html   | 41 +++++++++++++++++++
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../no-redirect/upgrade-protocol.http.html    | 41 +++++++++++++++++++
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../no-redirect/insecure-protocol.http.html   | 41 +++++++++++++++++++
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html               | 41 +++++++++++++++++++
 .../no-redirect/insecure-protocol.http.html   | 41 +++++++++++++++++++
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../no-redirect/upgrade-protocol.http.html    | 41 +++++++++++++++++++
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../a-tag/no-redirect/generic.http.html       | 40 ++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 40 ++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 40 ++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 40 ++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../keep-origin-redirect/generic.http.html    | 41 +++++++++++++++++++
 .../generic.http.html.headers}                |  0
 .../no-redirect/generic.http.html             | 41 +++++++++++++++++++
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers}    |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers}                |  0
 .../generic.http.html}                        |  0
 .../generic.http.html.headers                 |  2 +
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers     |  2 +
 .../generic.http.html}                        |  0
 .../generic.http.html.headers                 |  2 +
 .../generic.http.html}                        |  0
 .../generic.http.html.headers                 |  2 +
 .../generic.http.html}                        |  0
 .../no-redirect/generic.http.html.headers     |  2 +
 .../generic.http.html}                        |  0
 .../generic.http.html.headers                 |  2 +
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../keep-origin-redirect/generic.http.html    | 41 +++++++++++++++++++
 .../no-redirect/generic.http.html             | 41 +++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../a-tag/no-redirect/generic.http.html       | 41 +++++++++++++++++++
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../generic.http.html}                        |  0
 .../no-redirect/insecure-protocol.http.html   | 40 ++++++++++++++++++
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../no-redirect/upgrade-protocol.http.html    | 40 ++++++++++++++++++
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../no-redirect/insecure-protocol.http.html   | 40 ++++++++++++++++++
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../no-redirect/upgrade-protocol.http.html    | 40 ++++++++++++++++++
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../no-redirect/insecure-protocol.http.html   | 40 ++++++++++++++++++
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../no-redirect/upgrade-protocol.http.html    | 40 ++++++++++++++++++
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../no-redirect/insecure-protocol.http.html   | 40 ++++++++++++++++++
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html               | 40 ++++++++++++++++++
 .../no-redirect/insecure-protocol.http.html   | 40 ++++++++++++++++++
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../no-redirect/upgrade-protocol.http.html    | 40 ++++++++++++++++++
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../no-redirect/insecure-protocol.http.html   | 40 ++++++++++++++++++
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../no-redirect/upgrade-protocol.http.html    | 40 ++++++++++++++++++
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../no-redirect/insecure-protocol.http.html   | 40 ++++++++++++++++++
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html               | 40 ++++++++++++++++++
 .../no-redirect/insecure-protocol.http.html   | 40 ++++++++++++++++++
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../insecure-protocol.http.html}              |  0
 .../no-redirect/upgrade-protocol.http.html    | 40 ++++++++++++++++++
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 .../upgrade-protocol.http.html}               |  0
 2113 files changed, 5955 insertions(+), 2 deletions(-)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/{fetch-request/insecure-protocol.keep-origin-redirect.http.html.headers => a-tag/no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/{insecure-protocol.no-redirect.http.html.headers => keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/{insecure-protocol.swap-origin-redirect.http.html.headers => no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/{iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html.headers => keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html.headers => no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/{img-tag/insecure-protocol.keep-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html.headers => keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html.headers => no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/{script-tag/insecure-protocol.keep-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html.headers => keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html.headers => no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/{xhr-request/insecure-protocol.keep-origin-redirect.http.html.headers => script-tag/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/{insecure-protocol.no-redirect.http.html.headers => keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/{insecure-protocol.swap-origin-redirect.http.html.headers => no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/{http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.headers => http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/{fetch-request/upgrade-protocol.no-redirect.http.html.headers => a-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html.headers => keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/{iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers => fetch-request/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/{iframe-tag/upgrade-protocol.no-redirect.http.html.headers => fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html.headers => keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/{img-tag/upgrade-protocol.keep-origin-redirect.http.html.headers => iframe-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/{img-tag/upgrade-protocol.no-redirect.http.html.headers => iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html.headers => keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/{script-tag/upgrade-protocol.keep-origin-redirect.http.html.headers => img-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/{script-tag/upgrade-protocol.no-redirect.http.html.headers => img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html.headers => keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/{xhr-request/upgrade-protocol.keep-origin-redirect.http.html.headers => script-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/{xhr-request/upgrade-protocol.no-redirect.http.html.headers => script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html.headers => keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/{same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.headers => cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/{same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.headers => cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/{fetch-request/insecure-protocol.swap-origin-redirect.http.html.headers => a-tag/no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/{iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers => fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/{iframe-tag/insecure-protocol.no-redirect.http.html.headers => fetch-request/no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/{iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/{img-tag/insecure-protocol.keep-origin-redirect.http.html.headers => iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/{img-tag/insecure-protocol.no-redirect.http.html.headers => iframe-tag/no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/{img-tag/insecure-protocol.swap-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/{script-tag/insecure-protocol.keep-origin-redirect.http.html.headers => img-tag/keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/{script-tag/insecure-protocol.no-redirect.http.html.headers => img-tag/no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/{script-tag/insecure-protocol.swap-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/{xhr-request/insecure-protocol.keep-origin-redirect.http.html.headers => script-tag/keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/{xhr-request/insecure-protocol.no-redirect.http.html.headers => script-tag/no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/{xhr-request/insecure-protocol.swap-origin-redirect.http.html.headers => script-tag/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/{http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.headers => http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/{http-https/fetch-request/upgrade-protocol.no-redirect.http.html.headers => http-http/worker-request/no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/{http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.headers => http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/{http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers => http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/{http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers => http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/{iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers => a-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/{img-tag/upgrade-protocol.keep-origin-redirect.http.html.headers => fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/{img-tag/upgrade-protocol.no-redirect.http.html.headers => fetch-request/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/{img-tag/upgrade-protocol.swap-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/{script-tag/upgrade-protocol.keep-origin-redirect.http.html.headers => iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/{script-tag/upgrade-protocol.no-redirect.http.html.headers => iframe-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/{script-tag/upgrade-protocol.swap-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/{xhr-request/upgrade-protocol.keep-origin-redirect.http.html.headers => img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/{xhr-request/upgrade-protocol.no-redirect.http.html.headers => img-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/{xhr-request/upgrade-protocol.swap-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
 rename referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers
 create mode 100644 referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
 create mode 100644 referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
 rename referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
 rename referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
 rename referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
 rename referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/{fetch-request/generic.keep-origin-redirect.http.html.headers => a-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/{generic.no-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/{generic.swap-origin-redirect.http.html.headers => no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/{iframe-tag/generic.keep-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/{generic.no-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html.headers => no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/{img-tag/generic.keep-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/{generic.no-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html.headers => no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/{script-tag/generic.keep-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/{generic.no-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html.headers => no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/{xhr-request/generic.keep-origin-redirect.http.html.headers => script-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/{generic.no-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/{generic.swap-origin-redirect.http.html.headers => no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/{http-https/fetch-request/generic.keep-origin-redirect.http.html.headers => http-http/xhr-request/swap-origin-redirect/generic.http.html.headers} (100%)
 create mode 100644 referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/{fetch-request/generic.no-redirect.http.html.headers => a-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/{generic.swap-origin-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/{iframe-tag/generic.keep-origin-redirect.http.html.headers => fetch-request/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/{iframe-tag/generic.no-redirect.http.html.headers => fetch-request/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/{img-tag/generic.keep-origin-redirect.http.html.headers => iframe-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/{img-tag/generic.no-redirect.http.html.headers => iframe-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/{script-tag/generic.keep-origin-redirect.http.html.headers => img-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/{script-tag/generic.no-redirect.http.html.headers => img-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/{xhr-request/generic.keep-origin-redirect.http.html.headers => script-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/{xhr-request/generic.no-redirect.http.html.headers => script-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/{generic.swap-origin-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/{same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.headers => cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/{same-origin/http-http/fetch-request/generic.no-redirect.http.html.headers => cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers} (100%)
 create mode 100644 referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/{fetch-request/generic.swap-origin-redirect.http.html.headers => a-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/{iframe-tag/generic.keep-origin-redirect.http.html.headers => fetch-request/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/{iframe-tag/generic.no-redirect.http.html.headers => fetch-request/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/{iframe-tag/generic.swap-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/{img-tag/generic.keep-origin-redirect.http.html.headers => iframe-tag/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/{img-tag/generic.no-redirect.http.html.headers => iframe-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/{img-tag/generic.swap-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/{script-tag/generic.keep-origin-redirect.http.html.headers => img-tag/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/{script-tag/generic.no-redirect.http.html.headers => img-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/{script-tag/generic.swap-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/{xhr-request/generic.keep-origin-redirect.http.html.headers => script-tag/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/{xhr-request/generic.no-redirect.http.html.headers => script-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/{xhr-request/generic.swap-origin-redirect.http.html.headers => script-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 create mode 100644 referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
 rename referrer-policy/no-referrer/http-rp/same-origin/{http-https/fetch-request/generic.keep-origin-redirect.http.html.headers => http-http/worker-request/keep-origin-redirect/generic.http.html.headers} (100%)
 create mode 100644 referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
 rename referrer-policy/no-referrer/http-rp/same-origin/{http-https/fetch-request/generic.no-redirect.http.html.headers => http-http/worker-request/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/{http-https/fetch-request/generic.swap-origin-redirect.http.html.headers => http-http/xhr-request/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/{http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers => http-http/xhr-request/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/{http-https/iframe-tag/generic.no-redirect.http.html.headers => http-http/xhr-request/swap-origin-redirect/generic.http.html.headers} (100%)
 create mode 100644 referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/{iframe-tag/generic.swap-origin-redirect.http.html.headers => a-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/{img-tag/generic.keep-origin-redirect.http.html.headers => fetch-request/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/{img-tag/generic.no-redirect.http.html.headers => fetch-request/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/{img-tag/generic.swap-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/{script-tag/generic.keep-origin-redirect.http.html.headers => iframe-tag/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/{script-tag/generic.no-redirect.http.html.headers => iframe-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/{script-tag/generic.swap-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/{xhr-request/generic.keep-origin-redirect.http.html.headers => img-tag/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/{xhr-request/generic.no-redirect.http.html.headers => img-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/{xhr-request/generic.swap-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
 rename referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
 create mode 100644 referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
 create mode 100644 referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
 rename referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
 rename referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html
 create mode 100644 referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/{same-origin-downgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/{same-origin-upgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/{same-origin-downgrade.no-redirect.http.html => no-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/{same-origin-upgrade.no-redirect.http.html => no-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/{same-origin-downgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/{same-origin-upgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/{same-origin-downgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/{same-origin-upgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/{same-origin-downgrade.no-redirect.http.html => no-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/{same-origin-upgrade.no-redirect.http.html => no-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/{same-origin-downgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/{same-origin-upgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/{same-origin-downgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/{same-origin-upgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/{same-origin-downgrade.no-redirect.http.html => no-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/{same-origin-upgrade.no-redirect.http.html => no-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/{same-origin-downgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/{same-origin-upgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-upgrade.http.html} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/{fetch-request/cross-origin.keep-origin-redirect.http.html.headers => a-tag/no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/{cross-origin.no-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/{cross-origin.swap-origin-redirect.http.html.headers => no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/{iframe-tag/cross-origin.keep-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/{cross-origin.no-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/{cross-origin.swap-origin-redirect.http.html.headers => no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/{img-tag/cross-origin.keep-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/{cross-origin.no-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/{cross-origin.swap-origin-redirect.http.html.headers => no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/{script-tag/cross-origin.keep-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/{cross-origin.no-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/{cross-origin.swap-origin-redirect.http.html.headers => no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/{xhr-request/cross-origin.keep-origin-redirect.http.html.headers => script-tag/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/{cross-origin.no-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/{cross-origin.swap-origin-redirect.http.html.headers => no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/{http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.headers => http-http/xhr-request/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/{fetch-request/cross-origin.no-redirect.http.html.headers => a-tag/no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/{cross-origin.swap-origin-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/{iframe-tag/cross-origin.keep-origin-redirect.http.html.headers => fetch-request/no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/{iframe-tag/cross-origin.no-redirect.http.html.headers => fetch-request/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/{cross-origin.swap-origin-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/{img-tag/cross-origin.keep-origin-redirect.http.html.headers => iframe-tag/no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/{img-tag/cross-origin.no-redirect.http.html.headers => iframe-tag/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/{cross-origin.swap-origin-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/{script-tag/cross-origin.keep-origin-redirect.http.html.headers => img-tag/no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/{script-tag/cross-origin.no-redirect.http.html.headers => img-tag/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/{cross-origin.swap-origin-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/{xhr-request/cross-origin.keep-origin-redirect.http.html.headers => script-tag/no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/{xhr-request/cross-origin.no-redirect.http.html.headers => script-tag/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/{cross-origin.swap-origin-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/{same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.headers => cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/{same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.headers => cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/{fetch-request/same-origin-insecure.swap-origin-redirect.http.html.headers => a-tag/no-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/{iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers => fetch-request/keep-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/{iframe-tag/same-origin-insecure.no-redirect.http.html.headers => fetch-request/no-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/{iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/{img-tag/same-origin-insecure.keep-origin-redirect.http.html.headers => iframe-tag/keep-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/{img-tag/same-origin-insecure.no-redirect.http.html.headers => iframe-tag/no-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/{img-tag/same-origin-insecure.swap-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/{script-tag/same-origin-insecure.keep-origin-redirect.http.html.headers => img-tag/keep-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/{script-tag/same-origin-insecure.no-redirect.http.html.headers => img-tag/no-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/{script-tag/same-origin-insecure.swap-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/{xhr-request/same-origin-insecure.keep-origin-redirect.http.html.headers => script-tag/keep-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/{xhr-request/same-origin-insecure.no-redirect.http.html.headers => script-tag/no-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/{xhr-request/same-origin-insecure.swap-origin-redirect.http.html.headers => script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/{http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html.headers => http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/{http-https/fetch-request/same-origin-downgrade.no-redirect.http.html.headers => http-http/worker-request/no-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/{http-https/fetch-request/same-origin-downgrade.swap-origin-redirect.http.html.headers => http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/{http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.headers => http-http/xhr-request/no-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/{http-https/fetch-request/same-origin-upgrade.keep-origin-redirect.http.html.headers => http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{fetch-request/same-origin-upgrade.no-redirect.http.html.headers => a-tag/no-redirect/same-origin-downgrade.http.html.headers} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{fetch-request/same-origin-upgrade.swap-origin-redirect.http.html.headers => a-tag/no-redirect/same-origin-upgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/{same-origin-downgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers => fetch-request/keep-origin-redirect/same-origin-downgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/{same-origin-upgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{iframe-tag/same-origin-downgrade.no-redirect.http.html.headers => fetch-request/keep-origin-redirect/same-origin-upgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/{same-origin-downgrade.no-redirect.http.html => no-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers => fetch-request/no-redirect/same-origin-downgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/{same-origin-upgrade.no-redirect.http.html => no-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers => fetch-request/no-redirect/same-origin-upgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/{same-origin-downgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/same-origin-downgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{iframe-tag/same-origin-upgrade.no-redirect.http.html.headers => fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/{same-origin-upgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/same-origin-upgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/{same-origin-downgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{img-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers => iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/{same-origin-upgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{img-tag/same-origin-downgrade.no-redirect.http.html.headers => iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/{same-origin-downgrade.no-redirect.http.html => no-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{img-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers => iframe-tag/no-redirect/same-origin-downgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/{same-origin-upgrade.no-redirect.http.html => no-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{img-tag/same-origin-insecure.swap-origin-redirect.http.html.headers => iframe-tag/no-redirect/same-origin-upgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/{same-origin-downgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{img-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{img-tag/same-origin-upgrade.no-redirect.http.html.headers => iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/{same-origin-upgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{img-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/{same-origin-downgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{script-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers => img-tag/keep-origin-redirect/same-origin-downgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/{same-origin-upgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{script-tag/same-origin-downgrade.no-redirect.http.html.headers => img-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/{same-origin-downgrade.no-redirect.http.html => no-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{script-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers => img-tag/no-redirect/same-origin-downgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/{same-origin-upgrade.no-redirect.http.html => no-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{script-tag/same-origin-insecure.swap-origin-redirect.http.html.headers => img-tag/no-redirect/same-origin-upgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/{same-origin-downgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{script-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/same-origin-downgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{script-tag/same-origin-upgrade.no-redirect.http.html.headers => img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/{same-origin-upgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{script-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/same-origin-upgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/{same-origin-downgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{xhr-request/same-origin-downgrade.keep-origin-redirect.http.html.headers => script-tag/keep-origin-redirect/same-origin-downgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/{same-origin-upgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{xhr-request/same-origin-downgrade.no-redirect.http.html.headers => script-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/{same-origin-downgrade.no-redirect.http.html => no-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{xhr-request/same-origin-downgrade.swap-origin-redirect.http.html.headers => script-tag/no-redirect/same-origin-downgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/{same-origin-upgrade.no-redirect.http.html => no-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{xhr-request/same-origin-insecure.swap-origin-redirect.http.html.headers => script-tag/no-redirect/same-origin-upgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/{same-origin-downgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{xhr-request/same-origin-upgrade.keep-origin-redirect.http.html.headers => script-tag/swap-origin-redirect/same-origin-downgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{xhr-request/same-origin-upgrade.no-redirect.http.html.headers => script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/{same-origin-upgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/{xhr-request/same-origin-upgrade.swap-origin-redirect.http.html.headers => script-tag/swap-origin-redirect/same-origin-upgrade.http.html.headers} (100%)
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/{same-origin-downgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-downgrade.http.html} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-downgrade.http.html.headers
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/{same-origin-upgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-upgrade.http.html} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html.headers
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/{same-origin-downgrade.no-redirect.http.html => no-redirect/same-origin-downgrade.http.html} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-downgrade.http.html.headers
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/{same-origin-upgrade.no-redirect.http.html => no-redirect/same-origin-upgrade.http.html} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html.headers
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/{same-origin-downgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-downgrade.http.html} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-downgrade.http.html.headers
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers
 rename referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/{same-origin-upgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-upgrade.http.html} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-upgrade.http.html.headers
 create mode 100644 referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
 create mode 100644 referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 create mode 100644 referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html
 create mode 100644 referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/{same-origin-downgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/{same-origin-upgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/{same-origin-downgrade.no-redirect.http.html => no-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/{same-origin-upgrade.no-redirect.http.html => no-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/{same-origin-downgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/{same-origin-upgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/{same-origin-downgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/{same-origin-upgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/{same-origin-downgrade.no-redirect.http.html => no-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/{same-origin-upgrade.no-redirect.http.html => no-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/{same-origin-downgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/{same-origin-upgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/{same-origin-downgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/{same-origin-upgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/{same-origin-downgrade.no-redirect.http.html => no-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/{same-origin-upgrade.no-redirect.http.html => no-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/{same-origin-downgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/{same-origin-upgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/{same-origin-downgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/{same-origin-upgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/{same-origin-downgrade.no-redirect.http.html => no-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/{same-origin-upgrade.no-redirect.http.html => no-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/{same-origin-downgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/{same-origin-upgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/{same-origin-downgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/{same-origin-upgrade.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/{same-origin-downgrade.no-redirect.http.html => no-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/{same-origin-upgrade.no-redirect.http.html => no-redirect/same-origin-upgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/{same-origin-downgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-downgrade.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/{same-origin-upgrade.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-upgrade.http.html} (100%)
 create mode 100644 referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
 rename referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
 rename referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
 rename referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
 rename referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
 rename referrer-policy/origin/http-rp/cross-origin/http-http/{fetch-request/generic.keep-origin-redirect.http.html.headers => a-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/{generic.no-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/{generic.swap-origin-redirect.http.html.headers => no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/{iframe-tag/generic.keep-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/{generic.no-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html.headers => no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/{img-tag/generic.keep-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/{generic.no-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html.headers => no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/{script-tag/generic.keep-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/{generic.no-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html.headers => no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/{xhr-request/generic.keep-origin-redirect.http.html.headers => script-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/{generic.no-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/{generic.swap-origin-redirect.http.html.headers => no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/{http-https/fetch-request/generic.keep-origin-redirect.http.html.headers => http-http/xhr-request/swap-origin-redirect/generic.http.html.headers} (100%)
 create mode 100644 referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
 rename referrer-policy/origin/http-rp/cross-origin/http-https/{fetch-request/generic.no-redirect.http.html.headers => a-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/{generic.swap-origin-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/{iframe-tag/generic.keep-origin-redirect.http.html.headers => fetch-request/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/{iframe-tag/generic.no-redirect.http.html.headers => fetch-request/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/{img-tag/generic.keep-origin-redirect.http.html.headers => iframe-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/{img-tag/generic.no-redirect.http.html.headers => iframe-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/{script-tag/generic.keep-origin-redirect.http.html.headers => img-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/{script-tag/generic.no-redirect.http.html.headers => img-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/{xhr-request/generic.keep-origin-redirect.http.html.headers => script-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/{xhr-request/generic.no-redirect.http.html.headers => script-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/{generic.swap-origin-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/{same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.headers => cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/{same-origin/http-http/fetch-request/generic.no-redirect.http.html.headers => cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers} (100%)
 create mode 100644 referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
 rename referrer-policy/origin/http-rp/same-origin/http-http/{fetch-request/generic.swap-origin-redirect.http.html.headers => a-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/{iframe-tag/generic.keep-origin-redirect.http.html.headers => fetch-request/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/{iframe-tag/generic.no-redirect.http.html.headers => fetch-request/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/{iframe-tag/generic.swap-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/{img-tag/generic.keep-origin-redirect.http.html.headers => iframe-tag/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/{img-tag/generic.no-redirect.http.html.headers => iframe-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/{img-tag/generic.swap-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/{script-tag/generic.keep-origin-redirect.http.html.headers => img-tag/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/{script-tag/generic.no-redirect.http.html.headers => img-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/{script-tag/generic.swap-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/{xhr-request/generic.keep-origin-redirect.http.html.headers => script-tag/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/{xhr-request/generic.no-redirect.http.html.headers => script-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/{xhr-request/generic.swap-origin-redirect.http.html.headers => script-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 create mode 100644 referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
 rename referrer-policy/origin/http-rp/same-origin/{http-https/fetch-request/generic.keep-origin-redirect.http.html.headers => http-http/worker-request/keep-origin-redirect/generic.http.html.headers} (100%)
 create mode 100644 referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
 rename referrer-policy/origin/http-rp/same-origin/{http-https/fetch-request/generic.no-redirect.http.html.headers => http-http/worker-request/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/{http-https/fetch-request/generic.swap-origin-redirect.http.html.headers => http-http/xhr-request/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/{http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers => http-http/xhr-request/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/{http-https/iframe-tag/generic.no-redirect.http.html.headers => http-http/xhr-request/swap-origin-redirect/generic.http.html.headers} (100%)
 create mode 100644 referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
 rename referrer-policy/origin/http-rp/same-origin/http-https/{iframe-tag/generic.swap-origin-redirect.http.html.headers => a-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/{img-tag/generic.keep-origin-redirect.http.html.headers => fetch-request/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/{img-tag/generic.no-redirect.http.html.headers => fetch-request/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/{img-tag/generic.swap-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/{script-tag/generic.keep-origin-redirect.http.html.headers => iframe-tag/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/{script-tag/generic.no-redirect.http.html.headers => iframe-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/{script-tag/generic.swap-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/{xhr-request/generic.keep-origin-redirect.http.html.headers => img-tag/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/{xhr-request/generic.no-redirect.http.html.headers => img-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/{xhr-request/generic.swap-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/origin/http-rp/same-origin/http-https/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
 rename referrer-policy/origin/http-rp/same-origin/http-https/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers
 rename referrer-policy/origin/http-rp/same-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
 rename referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
 rename referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
 rename referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
 create mode 100644 referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
 rename referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
 rename referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
 rename referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
 create mode 100644 referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
 rename referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
 rename referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
 rename referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 create mode 100644 referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
 rename referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 create mode 100644 referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
 rename referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 create mode 100644 referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/{fetch-request/cross-origin.keep-origin-redirect.http.html.headers => a-tag/no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/{cross-origin.no-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/{cross-origin.swap-origin-redirect.http.html.headers => no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/{iframe-tag/cross-origin.keep-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/{cross-origin.no-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/{cross-origin.swap-origin-redirect.http.html.headers => no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/{img-tag/cross-origin.keep-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/{cross-origin.no-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/{cross-origin.swap-origin-redirect.http.html.headers => no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/{script-tag/cross-origin.keep-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/{cross-origin.no-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/{cross-origin.swap-origin-redirect.http.html.headers => no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/{xhr-request/cross-origin.keep-origin-redirect.http.html.headers => script-tag/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/{cross-origin.no-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/{cross-origin.swap-origin-redirect.http.html.headers => no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/{http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.headers => http-http/xhr-request/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 create mode 100644 referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/{fetch-request/cross-origin.no-redirect.http.html.headers => a-tag/no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/{cross-origin.swap-origin-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/{iframe-tag/cross-origin.keep-origin-redirect.http.html.headers => fetch-request/no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/{iframe-tag/cross-origin.no-redirect.http.html.headers => fetch-request/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/{cross-origin.swap-origin-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/{img-tag/cross-origin.keep-origin-redirect.http.html.headers => iframe-tag/no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/{img-tag/cross-origin.no-redirect.http.html.headers => iframe-tag/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/{cross-origin.swap-origin-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/{script-tag/cross-origin.keep-origin-redirect.http.html.headers => img-tag/no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/{script-tag/cross-origin.no-redirect.http.html.headers => img-tag/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/{cross-origin.swap-origin-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/{xhr-request/cross-origin.keep-origin-redirect.http.html.headers => script-tag/no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/{xhr-request/cross-origin.no-redirect.http.html.headers => script-tag/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/{cross-origin.swap-origin-redirect.http.html.headers => keep-origin-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/{same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.headers => cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/{same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.headers => cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html.headers} (100%)
 create mode 100644 referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/{fetch-request/same-origin-insecure.swap-origin-redirect.http.html.headers => a-tag/no-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/{iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers => fetch-request/keep-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/{iframe-tag/same-origin-insecure.no-redirect.http.html.headers => fetch-request/no-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/{iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/{img-tag/same-origin-insecure.keep-origin-redirect.http.html.headers => iframe-tag/keep-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/{img-tag/same-origin-insecure.no-redirect.http.html.headers => iframe-tag/no-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/{img-tag/same-origin-insecure.swap-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/{script-tag/same-origin-insecure.keep-origin-redirect.http.html.headers => img-tag/keep-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/{script-tag/same-origin-insecure.no-redirect.http.html.headers => img-tag/no-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/{script-tag/same-origin-insecure.swap-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/{xhr-request/same-origin-insecure.keep-origin-redirect.http.html.headers => script-tag/keep-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/{xhr-request/same-origin-insecure.no-redirect.http.html.headers => script-tag/no-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/{xhr-request/same-origin-insecure.swap-origin-redirect.http.html.headers => script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 create mode 100644 referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
 rename referrer-policy/same-origin/http-rp/same-origin/{http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.headers => http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 create mode 100644 referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
 rename referrer-policy/same-origin/http-rp/same-origin/{http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers => http-http/worker-request/no-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/{http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.headers => http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/{http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html.headers => http-http/xhr-request/no-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/{http-https/xhr-request/same-origin-insecure.swap-origin-redirect.http.html.headers => http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers} (100%)
 rename referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 create mode 100644 referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers
 rename referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 create mode 100644 referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
 rename referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 create mode 100644 referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
 rename referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 create mode 100644 referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
 rename referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 create mode 100644 referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers
 create mode 100644 referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 create mode 100644 referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/{cross-origin.keep-origin-redirect.http.html => keep-origin-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/{cross-origin.no-redirect.http.html => no-redirect/cross-origin.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/{cross-origin.swap-origin-redirect.http.html => swap-origin-redirect/cross-origin.http.html} (100%)
 create mode 100644 referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 create mode 100644 referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
 create mode 100644 referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/{same-origin-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/{same-origin-insecure.no-redirect.http.html => no-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 rename referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/{same-origin-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-origin-insecure.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/{cross-insecure.keep-origin-redirect.http.html => keep-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/{cross-insecure.no-redirect.http.html => no-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/{cross-insecure.swap-origin-redirect.http.html => swap-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/{cross-insecure.keep-origin-redirect.http.html => keep-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/{cross-insecure.no-redirect.http.html => no-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/{cross-insecure.swap-origin-redirect.http.html => swap-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/{cross-insecure.keep-origin-redirect.http.html => keep-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/{cross-insecure.no-redirect.http.html => no-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/{cross-insecure.swap-origin-redirect.http.html => swap-origin-redirect/cross-insecure.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/{same-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/{same-insecure.no-redirect.http.html => no-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/{same-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/{same-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/{same-insecure.no-redirect.http.html => no-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/{same-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/{same-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/{same-insecure.no-redirect.http.html => no-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/{same-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-insecure.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/{fetch-request/cross-insecure.keep-origin-redirect.http.html.headers => a-tag/no-redirect/cross-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/{cross-insecure.keep-origin-redirect.http.html => keep-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/{cross-insecure.no-redirect.http.html.headers => keep-origin-redirect/cross-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/{cross-insecure.no-redirect.http.html => no-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/{cross-insecure.swap-origin-redirect.http.html.headers => no-redirect/cross-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/{cross-insecure.swap-origin-redirect.http.html => swap-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/{iframe-tag/cross-insecure.keep-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/cross-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/{cross-insecure.keep-origin-redirect.http.html => keep-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/{cross-insecure.no-redirect.http.html.headers => keep-origin-redirect/cross-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/{cross-insecure.no-redirect.http.html => no-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/{cross-insecure.swap-origin-redirect.http.html.headers => no-redirect/cross-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/{cross-insecure.swap-origin-redirect.http.html => swap-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/{img-tag/cross-insecure.keep-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/cross-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/{cross-insecure.keep-origin-redirect.http.html => keep-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/{cross-insecure.no-redirect.http.html.headers => keep-origin-redirect/cross-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/{cross-insecure.no-redirect.http.html => no-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/{cross-insecure.swap-origin-redirect.http.html.headers => no-redirect/cross-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/{cross-insecure.swap-origin-redirect.http.html => swap-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/{script-tag/cross-insecure.keep-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/cross-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/{cross-insecure.keep-origin-redirect.http.html => keep-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/{cross-insecure.no-redirect.http.html.headers => keep-origin-redirect/cross-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/{cross-insecure.no-redirect.http.html => no-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/{cross-insecure.swap-origin-redirect.http.html.headers => no-redirect/cross-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/{cross-insecure.swap-origin-redirect.http.html => swap-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/{xhr-request/cross-insecure.keep-origin-redirect.http.html.headers => script-tag/swap-origin-redirect/cross-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/{cross-insecure.keep-origin-redirect.http.html => keep-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/{cross-insecure.no-redirect.http.html.headers => keep-origin-redirect/cross-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/{cross-insecure.no-redirect.http.html => no-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/{cross-insecure.swap-origin-redirect.http.html.headers => no-redirect/cross-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/{cross-insecure.swap-origin-redirect.http.html => swap-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/{http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.headers => http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html.headers} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/{fetch-request/upgrade-protocol.no-redirect.http.html.headers => a-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html.headers => keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/{iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers => fetch-request/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/{iframe-tag/upgrade-protocol.no-redirect.http.html.headers => fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html.headers => keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/{img-tag/upgrade-protocol.keep-origin-redirect.http.html.headers => iframe-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/{img-tag/upgrade-protocol.no-redirect.http.html.headers => iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html.headers => keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/{script-tag/upgrade-protocol.keep-origin-redirect.http.html.headers => img-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/{script-tag/upgrade-protocol.no-redirect.http.html.headers => img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html.headers => keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/{xhr-request/upgrade-protocol.keep-origin-redirect.http.html.headers => script-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/{xhr-request/upgrade-protocol.no-redirect.http.html.headers => script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html.headers => keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/{same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html.headers => cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/{same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.headers => cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/{fetch-request/same-insecure.swap-origin-redirect.http.html.headers => a-tag/no-redirect/same-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/{same-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/{iframe-tag/same-insecure.keep-origin-redirect.http.html.headers => fetch-request/keep-origin-redirect/same-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/{same-insecure.no-redirect.http.html => no-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/{iframe-tag/same-insecure.no-redirect.http.html.headers => fetch-request/no-redirect/same-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/{same-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/{iframe-tag/same-insecure.swap-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/same-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/{same-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/{img-tag/same-insecure.keep-origin-redirect.http.html.headers => iframe-tag/keep-origin-redirect/same-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/{same-insecure.no-redirect.http.html => no-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/{img-tag/same-insecure.no-redirect.http.html.headers => iframe-tag/no-redirect/same-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/{same-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/{img-tag/same-insecure.swap-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/same-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/{same-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/{script-tag/same-insecure.keep-origin-redirect.http.html.headers => img-tag/keep-origin-redirect/same-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/{same-insecure.no-redirect.http.html => no-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/{script-tag/same-insecure.no-redirect.http.html.headers => img-tag/no-redirect/same-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/{same-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/{script-tag/same-insecure.swap-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/same-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/{same-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/{xhr-request/same-insecure.keep-origin-redirect.http.html.headers => script-tag/keep-origin-redirect/same-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/{same-insecure.no-redirect.http.html => no-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/{xhr-request/same-insecure.no-redirect.http.html.headers => script-tag/no-redirect/same-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/{same-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/{xhr-request/same-insecure.swap-origin-redirect.http.html.headers => script-tag/swap-origin-redirect/same-insecure.http.html.headers} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/{http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.headers => http-http/worker-request/keep-origin-redirect/same-insecure.http.html.headers} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/{http-https/fetch-request/upgrade-protocol.no-redirect.http.html.headers => http-http/worker-request/no-redirect/same-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/{same-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/{http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.headers => http-http/xhr-request/keep-origin-redirect/same-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/{same-insecure.no-redirect.http.html => no-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/{http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers => http-http/xhr-request/no-redirect/same-insecure.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/{same-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/{http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers => http-http/xhr-request/swap-origin-redirect/same-insecure.http.html.headers} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/{iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers => a-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/{img-tag/upgrade-protocol.keep-origin-redirect.http.html.headers => fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/{img-tag/upgrade-protocol.no-redirect.http.html.headers => fetch-request/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/{img-tag/upgrade-protocol.swap-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/{script-tag/upgrade-protocol.keep-origin-redirect.http.html.headers => iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/{script-tag/upgrade-protocol.no-redirect.http.html.headers => iframe-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/{script-tag/upgrade-protocol.swap-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/{xhr-request/upgrade-protocol.keep-origin-redirect.http.html.headers => img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/{xhr-request/upgrade-protocol.no-redirect.http.html.headers => img-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/{xhr-request/upgrade-protocol.swap-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
 rename referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/{cross-insecure.keep-origin-redirect.http.html => keep-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/{cross-insecure.no-redirect.http.html => no-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/{cross-insecure.swap-origin-redirect.http.html => swap-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/{cross-insecure.keep-origin-redirect.http.html => keep-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/{cross-insecure.no-redirect.http.html => no-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/{cross-insecure.swap-origin-redirect.http.html => swap-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/{cross-insecure.keep-origin-redirect.http.html => keep-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/{cross-insecure.no-redirect.http.html => no-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/{cross-insecure.swap-origin-redirect.http.html => swap-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/{cross-insecure.keep-origin-redirect.http.html => keep-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/{cross-insecure.no-redirect.http.html => no-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/{cross-insecure.swap-origin-redirect.http.html => swap-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/{cross-insecure.keep-origin-redirect.http.html => keep-origin-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/{cross-insecure.no-redirect.http.html => no-redirect/cross-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/{cross-insecure.swap-origin-redirect.http.html => swap-origin-redirect/cross-insecure.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/{same-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/{same-insecure.no-redirect.http.html => no-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/{same-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/{same-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/{same-insecure.no-redirect.http.html => no-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/{same-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/{same-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/{same-insecure.no-redirect.http.html => no-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/{same-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/{same-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/{same-insecure.no-redirect.http.html => no-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/{same-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-insecure.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/{same-insecure.keep-origin-redirect.http.html => keep-origin-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/{same-insecure.no-redirect.http.html => no-redirect/same-insecure.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/{same-insecure.swap-origin-redirect.http.html => swap-origin-redirect/same-insecure.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
 rename referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
 rename referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/{fetch-request/insecure-protocol.keep-origin-redirect.http.html.headers => a-tag/no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/{insecure-protocol.no-redirect.http.html.headers => keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/{insecure-protocol.swap-origin-redirect.http.html.headers => no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/{iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html.headers => keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html.headers => no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/{img-tag/insecure-protocol.keep-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html.headers => keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html.headers => no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/{script-tag/insecure-protocol.keep-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html.headers => keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html.headers => no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/{xhr-request/insecure-protocol.keep-origin-redirect.http.html.headers => script-tag/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/{insecure-protocol.no-redirect.http.html.headers => keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/{insecure-protocol.swap-origin-redirect.http.html.headers => no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/{http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.headers => http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 create mode 100644 referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/{fetch-request/upgrade-protocol.no-redirect.http.html.headers => a-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html.headers => keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/{iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers => fetch-request/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/{iframe-tag/upgrade-protocol.no-redirect.http.html.headers => fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html.headers => keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/{img-tag/upgrade-protocol.keep-origin-redirect.http.html.headers => iframe-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/{img-tag/upgrade-protocol.no-redirect.http.html.headers => iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html.headers => keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/{script-tag/upgrade-protocol.keep-origin-redirect.http.html.headers => img-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/{script-tag/upgrade-protocol.no-redirect.http.html.headers => img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html.headers => keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/{xhr-request/upgrade-protocol.keep-origin-redirect.http.html.headers => script-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/{xhr-request/upgrade-protocol.no-redirect.http.html.headers => script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html.headers => keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/{same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.headers => cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/{same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.headers => cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 create mode 100644 referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/{fetch-request/insecure-protocol.swap-origin-redirect.http.html.headers => a-tag/no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/{iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers => fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/{iframe-tag/insecure-protocol.no-redirect.http.html.headers => fetch-request/no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/{iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/{img-tag/insecure-protocol.keep-origin-redirect.http.html.headers => iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/{img-tag/insecure-protocol.no-redirect.http.html.headers => iframe-tag/no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/{img-tag/insecure-protocol.swap-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/{script-tag/insecure-protocol.keep-origin-redirect.http.html.headers => img-tag/keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/{script-tag/insecure-protocol.no-redirect.http.html.headers => img-tag/no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/{script-tag/insecure-protocol.swap-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/{xhr-request/insecure-protocol.keep-origin-redirect.http.html.headers => script-tag/keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/{xhr-request/insecure-protocol.no-redirect.http.html.headers => script-tag/no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/{xhr-request/insecure-protocol.swap-origin-redirect.http.html.headers => script-tag/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 create mode 100644 referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
 rename referrer-policy/strict-origin/http-rp/same-origin/{http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.headers => http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 create mode 100644 referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
 rename referrer-policy/strict-origin/http-rp/same-origin/{http-https/fetch-request/upgrade-protocol.no-redirect.http.html.headers => http-http/worker-request/no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/{http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.headers => http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/{http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers => http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/{http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers => http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers} (100%)
 create mode 100644 referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/{iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers => a-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/{img-tag/upgrade-protocol.keep-origin-redirect.http.html.headers => fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/{img-tag/upgrade-protocol.no-redirect.http.html.headers => fetch-request/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/{img-tag/upgrade-protocol.swap-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/{script-tag/upgrade-protocol.keep-origin-redirect.http.html.headers => iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/{script-tag/upgrade-protocol.no-redirect.http.html.headers => iframe-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/{script-tag/upgrade-protocol.swap-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/{xhr-request/upgrade-protocol.keep-origin-redirect.http.html.headers => img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/{xhr-request/upgrade-protocol.no-redirect.http.html.headers => img-tag/no-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/{xhr-request/upgrade-protocol.swap-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers} (100%)
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
 rename referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers
 create mode 100644 referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
 create mode 100644 referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 create mode 100644 referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
 rename referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
 rename referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
 rename referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
 rename referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/{fetch-request/generic.keep-origin-redirect.http.html.headers => a-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/{generic.no-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/{generic.swap-origin-redirect.http.html.headers => no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/{iframe-tag/generic.keep-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/{generic.no-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html.headers => no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/{img-tag/generic.keep-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/{generic.no-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html.headers => no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/{script-tag/generic.keep-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/{generic.no-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html.headers => no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/{xhr-request/generic.keep-origin-redirect.http.html.headers => script-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/{generic.no-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/{generic.swap-origin-redirect.http.html.headers => no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/{http-https/fetch-request/generic.keep-origin-redirect.http.html.headers => http-http/xhr-request/swap-origin-redirect/generic.http.html.headers} (100%)
 create mode 100644 referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/{fetch-request/generic.no-redirect.http.html.headers => a-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/{generic.swap-origin-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/{iframe-tag/generic.keep-origin-redirect.http.html.headers => fetch-request/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/{iframe-tag/generic.no-redirect.http.html.headers => fetch-request/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/{img-tag/generic.keep-origin-redirect.http.html.headers => iframe-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/{img-tag/generic.no-redirect.http.html.headers => iframe-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/{script-tag/generic.keep-origin-redirect.http.html.headers => img-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/{script-tag/generic.no-redirect.http.html.headers => img-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/{xhr-request/generic.keep-origin-redirect.http.html.headers => script-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/{xhr-request/generic.no-redirect.http.html.headers => script-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/{generic.swap-origin-redirect.http.html.headers => keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/{same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.headers => cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/{same-origin/http-http/fetch-request/generic.no-redirect.http.html.headers => cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers} (100%)
 create mode 100644 referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/{fetch-request/generic.swap-origin-redirect.http.html.headers => a-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/{iframe-tag/generic.keep-origin-redirect.http.html.headers => fetch-request/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/{iframe-tag/generic.no-redirect.http.html.headers => fetch-request/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/{iframe-tag/generic.swap-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/{img-tag/generic.keep-origin-redirect.http.html.headers => iframe-tag/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/{img-tag/generic.no-redirect.http.html.headers => iframe-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/{img-tag/generic.swap-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/{script-tag/generic.keep-origin-redirect.http.html.headers => img-tag/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/{script-tag/generic.no-redirect.http.html.headers => img-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/{script-tag/generic.swap-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/{xhr-request/generic.keep-origin-redirect.http.html.headers => script-tag/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/{xhr-request/generic.no-redirect.http.html.headers => script-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/{xhr-request/generic.swap-origin-redirect.http.html.headers => script-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 create mode 100644 referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
 rename referrer-policy/unsafe-url/http-rp/same-origin/{http-https/fetch-request/generic.keep-origin-redirect.http.html.headers => http-http/worker-request/keep-origin-redirect/generic.http.html.headers} (100%)
 create mode 100644 referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
 rename referrer-policy/unsafe-url/http-rp/same-origin/{http-https/fetch-request/generic.no-redirect.http.html.headers => http-http/worker-request/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/{http-https/fetch-request/generic.swap-origin-redirect.http.html.headers => http-http/xhr-request/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/{http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers => http-http/xhr-request/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/{http-https/iframe-tag/generic.no-redirect.http.html.headers => http-http/xhr-request/swap-origin-redirect/generic.http.html.headers} (100%)
 create mode 100644 referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/{iframe-tag/generic.swap-origin-redirect.http.html.headers => a-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/{img-tag/generic.keep-origin-redirect.http.html.headers => fetch-request/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/{img-tag/generic.no-redirect.http.html.headers => fetch-request/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/{img-tag/generic.swap-origin-redirect.http.html.headers => fetch-request/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/{script-tag/generic.keep-origin-redirect.http.html.headers => iframe-tag/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/{script-tag/generic.no-redirect.http.html.headers => iframe-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/{script-tag/generic.swap-origin-redirect.http.html.headers => iframe-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/{xhr-request/generic.keep-origin-redirect.http.html.headers => img-tag/keep-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/{xhr-request/generic.no-redirect.http.html.headers => img-tag/no-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/{xhr-request/generic.swap-origin-redirect.http.html.headers => img-tag/swap-origin-redirect/generic.http.html.headers} (100%)
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
 rename referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
 create mode 100644 referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
 create mode 100644 referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/{generic.keep-origin-redirect.http.html => keep-origin-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/{generic.no-redirect.http.html => no-redirect/generic.http.html} (100%)
 rename referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/{generic.swap-origin-redirect.http.html => swap-origin-redirect/generic.http.html} (100%)
 create mode 100644 referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
 rename referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 create mode 100644 referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
 rename referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 create mode 100644 referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 create mode 100644 referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 create mode 100644 referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
 create mode 100644 referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 create mode 100644 referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 create mode 100644 referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 create mode 100644 referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 create mode 100644 referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
 create mode 100644 referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/{insecure-protocol.keep-origin-redirect.http.html => keep-origin-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/{insecure-protocol.no-redirect.http.html => no-redirect/insecure-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/{insecure-protocol.swap-origin-redirect.http.html => swap-origin-redirect/insecure-protocol.http.html} (100%)
 create mode 100644 referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/{upgrade-protocol.keep-origin-redirect.http.html => keep-origin-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/{upgrade-protocol.no-redirect.http.html => no-redirect/upgrade-protocol.http.html} (100%)
 rename referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/{upgrade-protocol.swap-origin-redirect.http.html => swap-origin-redirect/upgrade-protocol.http.html} (100%)

diff --git a/referrer-policy/generic/tools/common_paths.py b/referrer-policy/generic/tools/common_paths.py
index 5b495c6975106d..9d73401387fe8e 100644
--- a/referrer-policy/generic/tools/common_paths.py
+++ b/referrer-policy/generic/tools/common_paths.py
@@ -18,10 +18,11 @@
 selection_pattern = '%(delivery_method)s/' + \
                     '%(origin)s/' + \
                     '%(source_protocol)s-%(target_protocol)s/' + \
-                    '%(subresource)s/'
+                    '%(subresource)s/' + \
+                    '%(redirection)s/'
 
 test_file_path_pattern = '%(spec_name)s/' + selection_pattern + \
-                         '%(name)s.%(redirection)s.%(source_protocol)s.html'
+                         '%(name)s.%(source_protocol)s.html'
 
 
 def get_template(basename):
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..101f20892106a6
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..9dcfbac38af31b
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..20d2c1be3d7ac2
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..ca23aa444bd77e
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..133936739413da
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..babd2f18cc56c3
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..ca38b699f4d9a4
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..b900876cb4ab16
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the http-rp
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "http-rp",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..834afccf676908
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..eec9e271431e0f
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
new file mode 100644
index 00000000000000..f2152da955f329
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: no-referrer-when-downgrade
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
new file mode 100644
index 00000000000000..f2152da955f329
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: no-referrer-when-downgrade
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
new file mode 100644
index 00000000000000..f2152da955f329
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: no-referrer-when-downgrade
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers
new file mode 100644
index 00000000000000..f2152da955f329
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: no-referrer-when-downgrade
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
new file mode 100644
index 00000000000000..f2152da955f329
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: no-referrer-when-downgrade
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers
new file mode 100644
index 00000000000000..f2152da955f329
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: no-referrer-when-downgrade
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..af2ce4df2e84aa
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..05b5362b4f5b1a
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..5a33e4c4b5020a
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..ff6b14d5a84579
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the meta-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "meta-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..d2541d3407f2a7
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..844daf18c88141
--- /dev/null
+++ b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..c58c2c723ad203
--- /dev/null
+++ b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..a0b8c34f540ef3
--- /dev/null
+++ b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..0a9f0a3af747c5
--- /dev/null
+++ b/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..2e65b4d125e446
--- /dev/null
+++ b/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..34815f46112b4b
--- /dev/null
+++ b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..1d3f7dce1f9761
--- /dev/null
+++ b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..713221d297a918
--- /dev/null
+++ b/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
new file mode 100644
index 00000000000000..e0d3bd0faf8ab8
--- /dev/null
+++ b/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the http-rp
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "http-rp",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..f6a5f615bb4e0f
--- /dev/null
+++ b/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..131a9c07803a9c
--- /dev/null
+++ b/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/generic.no-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/generic.no-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
new file mode 100644
index 00000000000000..9b531426e5ab95
--- /dev/null
+++ b/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: no-referrer
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers
new file mode 100644
index 00000000000000..9b531426e5ab95
--- /dev/null
+++ b/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: no-referrer
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
new file mode 100644
index 00000000000000..9b531426e5ab95
--- /dev/null
+++ b/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: no-referrer
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
new file mode 100644
index 00000000000000..9b531426e5ab95
--- /dev/null
+++ b/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: no-referrer
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/generic.no-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
new file mode 100644
index 00000000000000..9b531426e5ab95
--- /dev/null
+++ b/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: no-referrer
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers b/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
new file mode 100644
index 00000000000000..9b531426e5ab95
--- /dev/null
+++ b/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: no-referrer
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..4f02037581d610
--- /dev/null
+++ b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <meta name="referrer" content="no-referrer">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..31e5d1662cc3da
--- /dev/null
+++ b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <meta name="referrer" content="no-referrer">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..1a73ec9e959023
--- /dev/null
+++ b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <meta name="referrer" content="no-referrer">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
new file mode 100644
index 00000000000000..b9ac0adff0d2af
--- /dev/null
+++ b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <meta name="referrer" content="no-referrer">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the meta-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "meta-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..1cb5b30bafb80d
--- /dev/null
+++ b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <meta name="referrer" content="no-referrer">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..7932926619c63e
--- /dev/null
+++ b/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <meta name="referrer" content="no-referrer">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/generic.no-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
new file mode 100644
index 00000000000000..822706864ff070
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
new file mode 100644
index 00000000000000..0626306d65adab
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
new file mode 100644
index 00000000000000..eadb3d1d614d68
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html
new file mode 100644
index 00000000000000..12903c4da403b7
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
new file mode 100644
index 00000000000000..12903c4da403b7
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
new file mode 100644
index 00000000000000..d78b7146cceff8
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
new file mode 100644
index 00000000000000..637ed02656ef79
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
new file mode 100644
index 00000000000000..f481aa975e944c
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
new file mode 100644
index 00000000000000..1ae15983f6cded
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the http-rp
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "http-rp",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
new file mode 100644
index 00000000000000..14159b0d5b9722
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html
new file mode 100644
index 00000000000000..79e75063576a06
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
new file mode 100644
index 00000000000000..79e75063576a06
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-downgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-downgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-downgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-downgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-downgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-downgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-upgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-upgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-downgrade.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-downgrade.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-upgrade.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-upgrade.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-downgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-downgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-downgrade.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-downgrade.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-upgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-upgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-downgrade.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-downgrade.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-downgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-downgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-downgrade.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-downgrade.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-upgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-upgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-downgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-downgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-upgrade.keep-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-upgrade.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-upgrade.no-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-upgrade.no-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-upgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/same-origin-upgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-upgrade.swap-origin-redirect.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-upgrade.http.html.headers
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-upgrade.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-upgrade.http.html.headers
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-downgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-downgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-downgrade.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-downgrade.http.html.headers
new file mode 100644
index 00000000000000..9ce1de38843b35
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-downgrade.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: origin-when-cross-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-upgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-upgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html.headers
new file mode 100644
index 00000000000000..9ce1de38843b35
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: origin-when-cross-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-downgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-downgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-downgrade.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-downgrade.http.html.headers
new file mode 100644
index 00000000000000..9ce1de38843b35
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-downgrade.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: origin-when-cross-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-upgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-upgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html.headers
new file mode 100644
index 00000000000000..9ce1de38843b35
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: origin-when-cross-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-downgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-downgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-downgrade.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-downgrade.http.html.headers
new file mode 100644
index 00000000000000..9ce1de38843b35
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-downgrade.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: origin-when-cross-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers
new file mode 100644
index 00000000000000..9ce1de38843b35
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: origin-when-cross-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-upgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/same-origin-upgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-upgrade.http.html.headers b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-upgrade.http.html.headers
new file mode 100644
index 00000000000000..9ce1de38843b35
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-upgrade.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: origin-when-cross-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
new file mode 100644
index 00000000000000..6a1e8da86f081b
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
new file mode 100644
index 00000000000000..d2784edeecf708
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
new file mode 100644
index 00000000000000..ef7b77d48eb764
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
new file mode 100644
index 00000000000000..3bd6428d327219
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the meta-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
new file mode 100644
index 00000000000000..497b8f61748227
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html
new file mode 100644
index 00000000000000..2111a0cf7c5bb0
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
new file mode 100644
index 00000000000000..2111a0cf7c5bb0
--- /dev/null
+++ b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-upgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-upgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-downgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-downgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-upgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-upgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-downgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-downgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-upgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-upgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-downgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-downgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-upgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-upgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-downgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-downgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-upgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-upgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-downgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-downgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-upgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-upgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-downgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-downgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-upgrade.keep-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-upgrade.keep-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-downgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-downgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-upgrade.no-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-upgrade.no-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-downgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-downgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-downgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-downgrade.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-upgrade.swap-origin-redirect.http.html b/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-upgrade.http.html
similarity index 100%
rename from referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-upgrade.swap-origin-redirect.http.html
rename to referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-upgrade.http.html
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..290d81d821a60c
--- /dev/null
+++ b/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..6d528c04d01379
--- /dev/null
+++ b/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..899f078c943c09
--- /dev/null
+++ b/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..e71d09acc8f135
--- /dev/null
+++ b/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..5592aa5d0743f2
--- /dev/null
+++ b/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..b8b2f5ad637705
--- /dev/null
+++ b/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html b/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..7b79cdeb43229e
--- /dev/null
+++ b/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/script-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/script-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
new file mode 100644
index 00000000000000..be0f44caff62cb
--- /dev/null
+++ b/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the http-rp
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "http-rp",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html b/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..74428173606555
--- /dev/null
+++ b/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html b/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..f3110e130184a6
--- /dev/null
+++ b/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/script-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/generic.no-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/generic.no-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
new file mode 100644
index 00000000000000..306a53536ac576
--- /dev/null
+++ b/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/script-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers
new file mode 100644
index 00000000000000..306a53536ac576
--- /dev/null
+++ b/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
new file mode 100644
index 00000000000000..306a53536ac576
--- /dev/null
+++ b/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
new file mode 100644
index 00000000000000..306a53536ac576
--- /dev/null
+++ b/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/generic.no-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
new file mode 100644
index 00000000000000..306a53536ac576
--- /dev/null
+++ b/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers b/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
new file mode 100644
index 00000000000000..306a53536ac576
--- /dev/null
+++ b/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..0d756694501985
--- /dev/null
+++ b/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <meta name="referrer" content="origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..ad1d0d06a66773
--- /dev/null
+++ b/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <meta name="referrer" content="origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..69c724f4eed283
--- /dev/null
+++ b/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <meta name="referrer" content="origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
new file mode 100644
index 00000000000000..69a8c2c1d09d37
--- /dev/null
+++ b/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <meta name="referrer" content="origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the meta-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..4d4e8ef2ddb6de
--- /dev/null
+++ b/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <meta name="referrer" content="origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..f323ca74bd4e09
--- /dev/null
+++ b/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <meta name="referrer" content="origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/generic.no-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
new file mode 100644
index 00000000000000..8d4c19c4863d84
--- /dev/null
+++ b/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
new file mode 100644
index 00000000000000..59943a3ee452d8
--- /dev/null
+++ b/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
new file mode 100644
index 00000000000000..a384aa04e3be39
--- /dev/null
+++ b/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html b/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html b/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html b/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
new file mode 100644
index 00000000000000..f04cea14e663a8
--- /dev/null
+++ b/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
new file mode 100644
index 00000000000000..54629cb45b84d4
--- /dev/null
+++ b/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
new file mode 100644
index 00000000000000..1af12eb18e3224
--- /dev/null
+++ b/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
new file mode 100644
index 00000000000000..5f8f6c1e79275c
--- /dev/null
+++ b/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the http-rp
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "http-rp",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
new file mode 100644
index 00000000000000..44413d7b167d41
--- /dev/null
+++ b/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/same-origin-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/same-origin-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers
new file mode 100644
index 00000000000000..309da8091a9277
--- /dev/null
+++ b/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: same-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
new file mode 100644
index 00000000000000..309da8091a9277
--- /dev/null
+++ b/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: same-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
new file mode 100644
index 00000000000000..309da8091a9277
--- /dev/null
+++ b/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: same-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
new file mode 100644
index 00000000000000..309da8091a9277
--- /dev/null
+++ b/referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: same-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers b/referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers
new file mode 100644
index 00000000000000..309da8091a9277
--- /dev/null
+++ b/referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: same-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
new file mode 100644
index 00000000000000..319db6a902f888
--- /dev/null
+++ b/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <meta name="referrer" content="same-origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
new file mode 100644
index 00000000000000..80f337f9e74f23
--- /dev/null
+++ b/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <meta name="referrer" content="same-origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
new file mode 100644
index 00000000000000..ab255afb9bd524
--- /dev/null
+++ b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <meta name="referrer" content="same-origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
new file mode 100644
index 00000000000000..2e459e3d0592b6
--- /dev/null
+++ b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <meta name="referrer" content="same-origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the meta-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
new file mode 100644
index 00000000000000..0760ef944d8664
--- /dev/null
+++ b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <meta name="referrer" content="same-origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-insecure.swap-origin-redirect.http.html b/referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
similarity index 100%
rename from referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-insecure.swap-origin-redirect.http.html
rename to referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
new file mode 100644
index 00000000000000..0f00dc41185290
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..9e10c7fa348794
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
new file mode 100644
index 00000000000000..8ab2c077ffcad5
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..44b03ee27d2253
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
new file mode 100644
index 00000000000000..e49741ffb27076
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, 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. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-insecure.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-insecure.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-insecure.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-insecure.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-insecure.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-insecure.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/cross-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-insecure.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-insecure.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/cross-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..66928c51c3f6b4
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, 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. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
new file mode 100644
index 00000000000000..cddec2b7421bf1
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, 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. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-insecure.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-insecure.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-insecure.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-insecure.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-insecure.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-insecure.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-insecure.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-insecure.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-insecure.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-insecure.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/same-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-insecure.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-insecure.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
new file mode 100644
index 00000000000000..df71263b21b8dd
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, 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. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the http-rp
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "http-rp",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
new file mode 100644
index 00000000000000..c71cd293d230f9
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, 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. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/same-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..693c23702ee88f
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, 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. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
new file mode 100644
index 00000000000000..d74467b0af6f7d
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: strict-origin-when-cross-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
new file mode 100644
index 00000000000000..d74467b0af6f7d
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: strict-origin-when-cross-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
new file mode 100644
index 00000000000000..d74467b0af6f7d
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: strict-origin-when-cross-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers
new file mode 100644
index 00000000000000..d74467b0af6f7d
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: strict-origin-when-cross-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
new file mode 100644
index 00000000000000..d74467b0af6f7d
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: strict-origin-when-cross-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers
new file mode 100644
index 00000000000000..d74467b0af6f7d
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: strict-origin-when-cross-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
new file mode 100644
index 00000000000000..dbe403fc39de5a
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <meta name="referrer" content="strict-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-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/cross-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/cross-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/cross-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/cross-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/cross-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/cross-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..7b1ddac6e61ded
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <meta name="referrer" content="strict-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-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
new file mode 100644
index 00000000000000..2e49fa6bc310b9
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <meta name="referrer" content="strict-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-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/same-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/same-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/same-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/same-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/same-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/same-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
new file mode 100644
index 00000000000000..e9b7a295ab937e
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <meta name="referrer" content="strict-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-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the meta-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
new file mode 100644
index 00000000000000..f9e58ca6f78b6c
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <meta name="referrer" content="strict-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-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-insecure.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-insecure.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-insecure.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-insecure.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-insecure.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-insecure.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..3e10a769b59337
--- /dev/null
+++ b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <meta name="referrer" content="strict-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-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..de1463b5d3dbbe
--- /dev/null
+++ b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..6c5e16e343a494
--- /dev/null
+++ b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..b368130fe63e2f
--- /dev/null
+++ b/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..92f584e8be6192
--- /dev/null
+++ b/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..3a37854f3482f4
--- /dev/null
+++ b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..112efd4056cdd3
--- /dev/null
+++ b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..eced7c919476af
--- /dev/null
+++ b/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..1b30f714d08d52
--- /dev/null
+++ b/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the http-rp
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "http-rp",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..b5880bda93aa4f
--- /dev/null
+++ b/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..b25470749eb5b3
--- /dev/null
+++ b/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html.headers
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
new file mode 100644
index 00000000000000..07af8e286fd743
--- /dev/null
+++ b/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: strict-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
new file mode 100644
index 00000000000000..07af8e286fd743
--- /dev/null
+++ b/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: strict-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
new file mode 100644
index 00000000000000..07af8e286fd743
--- /dev/null
+++ b/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: strict-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers
new file mode 100644
index 00000000000000..07af8e286fd743
--- /dev/null
+++ b/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: strict-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
new file mode 100644
index 00000000000000..07af8e286fd743
--- /dev/null
+++ b/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: strict-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers b/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers
new file mode 100644
index 00000000000000..07af8e286fd743
--- /dev/null
+++ b/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: strict-origin
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..bdfe9f7b932f1b
--- /dev/null
+++ b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <meta name="referrer" content="strict-origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..a14d6f79ced351
--- /dev/null
+++ b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <meta name="referrer" content="strict-origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..32ceeff6b39ee7
--- /dev/null
+++ b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <meta name="referrer" content="strict-origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..7d18b730ec3fc8
--- /dev/null
+++ b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <meta name="referrer" content="strict-origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the meta-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..8a85ecfc756219
--- /dev/null
+++ b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <meta name="referrer" content="strict-origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..8f4342bcdbb5ca
--- /dev/null
+++ b/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <meta name="referrer" content="strict-origin">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..b803ec86857926
--- /dev/null
+++ b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..0ae15d3a6f5477
--- /dev/null
+++ b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..f1d51bf377deb5
--- /dev/null
+++ b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..3a4c60248c86a5
--- /dev/null
+++ b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..3aabb1d6e6b014
--- /dev/null
+++ b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..2ce057e691a648
--- /dev/null
+++ b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..2041b85a8e5a28
--- /dev/null
+++ b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
new file mode 100644
index 00000000000000..7882c1319c11d2
--- /dev/null
+++ b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the http-rp
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "http-rp",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..f9baeba7a31022
--- /dev/null
+++ b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..f0824a2291089e
--- /dev/null
+++ b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <!-- No meta: Referrer policy delivered via HTTP headers. -->
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/generic.no-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/generic.no-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html.headers
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
new file mode 100644
index 00000000000000..c67e521584390f
--- /dev/null
+++ b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: unsafe-url
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers
new file mode 100644
index 00000000000000..c67e521584390f
--- /dev/null
+++ b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: unsafe-url
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
new file mode 100644
index 00000000000000..c67e521584390f
--- /dev/null
+++ b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: unsafe-url
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
new file mode 100644
index 00000000000000..c67e521584390f
--- /dev/null
+++ b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: unsafe-url
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/generic.no-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
new file mode 100644
index 00000000000000..c67e521584390f
--- /dev/null
+++ b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: unsafe-url
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
new file mode 100644
index 00000000000000..c67e521584390f
--- /dev/null
+++ b/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
@@ -0,0 +1,2 @@
+Referrer-Policy: unsafe-url
+Access-Control-Allow-Origin: *
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..9bc18f9d5ea573
--- /dev/null
+++ b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <meta name="referrer" content="unsafe-url">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..8a372cee16a621
--- /dev/null
+++ b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <meta name="referrer" content="unsafe-url">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..0f16cc626c25c5
--- /dev/null
+++ b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <meta name="referrer" content="unsafe-url">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
new file mode 100644
index 00000000000000..7a763d011c7544
--- /dev/null
+++ b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <meta name="referrer" content="unsafe-url">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the meta-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "meta-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..bc7f41857aa469
--- /dev/null
+++ b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <meta name="referrer" content="unsafe-url">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
new file mode 100644
index 00000000000000..e00dc04118ced6
--- /dev/null
+++ b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <meta name="referrer" content="unsafe-url">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/generic.keep-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/generic.no-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/generic.no-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
diff --git a/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html b/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
similarity index 100%
rename from referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/generic.swap-origin-redirect.http.html
rename to referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..d4d48c5202e7a6
--- /dev/null
+++ b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..b495fd2330545b
--- /dev/null
+++ b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..29c0ced3a221e5
--- /dev/null
+++ b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..5ed0f06af2ac6a
--- /dev/null
+++ b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..e750aa9186ea06
--- /dev/null
+++ b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..3ddbcee365f1eb
--- /dev/null
+++ b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..6a70b5b42a19ad
--- /dev/null
+++ b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..686d4feab2f2c8
--- /dev/null
+++ b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the http-rp
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "http-rp",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..63195e03a244cc
--- /dev/null
+++ b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..00e67dffba8f89
--- /dev/null
+++ b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the http-rp
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "http-rp",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..d519295475bb5b
--- /dev/null
+++ b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..4c07e9aeb6614a
--- /dev/null
+++ b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..3e9b3473de133d
--- /dev/null
+++ b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..6500c7f756c0cc
--- /dev/null
+++ b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the meta-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "meta-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
new file mode 100644
index 00000000000000..5f10dd7f5e9d85
--- /dev/null
+++ b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via worker-request using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "worker-request",
+          "subresource_path": "/referrer-policy/generic/subresource/worker.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
new file mode 100644
index 00000000000000..2f6ec65f99f2ac
--- /dev/null
+++ b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via a-tag using the meta-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "meta-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "a-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/document.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.keep-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.no-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
diff --git a/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html b/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
similarity index 100%
rename from referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/upgrade-protocol.swap-origin-redirect.http.html
rename to referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html